Revert "Update cloud image"

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

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 357a6e6fbeccc02a8c16d79355e9b1c591823dda..80d00fb7a758bf357aeda917d491890a455676ef 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-magnesium
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'magnesium'
+    stream: 'aluminium'
     branch: 'master'
     jre: 'openjdk11'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
@@ -30,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: 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
@@ -50,13 +50,14 @@
           openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-sodium
+    name: netvirt-csit-hwvtep-openstack-integration-magnesium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
+    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'
@@ -79,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: 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
@@ -99,13 +100,13 @@
           openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-neon
+    name: netvirt-csit-hwvtep-openstack-integration-sodium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'neon'
-    branch: 'stable/neon'
+    stream: 'sodium'
+    branch: 'stable/sodium'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
@@ -128,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: 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