Set java-version to openjdk11

[releng/builder.git] / jjb / netvirt / netvirt-csit-multi-openstack-upgrade.yaml

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 6d41808236660568610c6fc7b18baad5c2662c9d..4d829e8c30441fce2a4887634e5e6c54726d20b9 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -1,12 +1,23 @@
 ---
 - project:
-    name: netvirt-csit-upgrade-openstack-integration-oxygen
+    name: netvirt-csit-upgrade-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'master'
+
+    stream:
+      - aluminium:
+          branch: 'master'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
+      - neon:
+          branch: 'stable/neon'
+
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
@@ -24,7 +35,7 @@
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-netvirt-openstack'
 
     functionality:
       - upgrade
@@ -36,5 +47,5 @@
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+          openstack_system_image: '{openstack_queens_system_image}'
+          openstack_system2_image: '{openstack_queens_system_image}'