Merge "add support for JVM monitoring"

[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 9d6eee6b1c393289781e59cb3b27a6ec0c386ddd..4ed7f4ff1c340b45cd2f8955b4c673f09fb80487 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -2,15 +2,17 @@
 - project:
     name: netvirt-csit-upgrade-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
 
     stream:
-      - neon:
+      - magnesium:
           branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
+      - sodium:
+          branch: 'stable/sodium'
+      - neon:
+          branch: 'stable/neon'
 
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'
@@ -29,7 +31,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
@@ -41,5 +43,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}'