Merge "Add neon and oxygen jobs for 1cmb"

[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 565bd6f18f19ae7420a51efeab1c1cfbd1f6bc75..9d6eee6b1c393289781e59cb3b27a6ec0c386ddd 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -1,27 +1,35 @@
 ---
 - project:
-    name: netvirt-csit-upgrade-openstack-integration-oxygen
+    name: netvirt-csit-upgrade-openstack-integration
     jobs:
       - inttest-csit-openstack
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'master'
+
+    stream:
+      - neon:
+          branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
+
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-standard-4
+    odl_system_flavor: odl-highcpu-8
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     functionality:
       - upgrade
@@ -33,5 +41,5 @@
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
+          openstack_system_image: '{openstack_system_image_queens}'
+          openstack_system2_image: '{openstack_system_image_queens}'