X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=27f79f1f5b52e5390e02c0f414727c55592f0c9d;hb=66891da217539c65b6017d8ac297494f1d5ea06d;hp=c9a18d2bf7205befb2d2715048f6e81ea3a1399a;hpb=8fb134b58cae4caea078c5f047883de189c00b93;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index c9a18d2bf..27f79f1f5 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,12 +1,13 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-neon
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'neon'
+    stream: 'aluminium'
     branch: 'master'
+    jre: 'openjdk11'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
@@ -16,7 +17,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -29,12 +30,12 @@
           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'
       - 3node:
-          openstack_system2_count: 2
+          openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
       - upstream-stateful
@@ -45,17 +46,18 @@
           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}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-fluorine
+    name: netvirt-csit-hwvtep-openstack-integration-magnesium
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'stable/fluorine'
+    stream: 'magnesium'
+    branch: 'stable/magnesium'
+    jre: 'openjdk11'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
@@ -65,7 +67,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -78,12 +80,12 @@
           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'
       - 3node:
-          openstack_system2_count: 2
+          openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
       - upstream-stateful
@@ -94,17 +96,17 @@
           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}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-oxygen
+    name: netvirt-csit-hwvtep-openstack-integration-sodium
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'oxygen'
-    branch: 'stable/oxygen'
+    stream: 'sodium'
+    branch: 'stable/sodium'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
@@ -114,7 +116,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -127,12 +129,12 @@
           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'
       - 3node:
-          openstack_system2_count: 2
+          openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
       - upstream-stateful
@@ -143,5 +145,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}'