X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack-upgrade.yaml;h=524c4d5443ba88f2382c87ea38087372cb31fb7d;hb=c5ef7ff9dfcb733f13ea4c09e650eeff521f3767;hp=565bd6f18f19ae7420a51efeab1c1cfbd1f6bc75;hpb=9fe387cfc5c222178e4bccc84bc3f9d4646ee5cb;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 565bd6f18..524c4d544 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -1,20 +1,172 @@
 ---
 - project:
-    name: netvirt-csit-upgrade-openstack-integration-oxygen
+    name: netvirt-csit-upgrade-openstack-integration-rocky
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'master'
+
+    stream:
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
+
+    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'
+    group-add-mod-enabled: 'true'
+    odl_system_flavor: odl-highcpu-2
+    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'
+
+    functionality:
+      - upgrade:
+          schedule: '{schedule-weekly}'
+      - upgrade-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
+
+    openstack:
+      - rocky:
+          openstack-branch: 'stable/rocky'
+          odl-ml2-branch: 'stable/rocky'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
+
+
+- project:
+    name: netvirt-csit-upgrade-openstack-integration-rocky-aluminium
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+
+    stream:
+      - aluminium:
+          branch: 'master'
+          jre: 'openjdk11'
+
+    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'
+    group-add-mod-enabled: 'true'
+    odl_system_flavor: odl-highcpu-2
+    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'
+
+    functionality:
+      - upgrade:
+          schedule: '{schedule-daily}'
+      - upgrade-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+
+    openstack:
+      - rocky:
+          openstack-branch: 'stable/rocky'
+          odl-ml2-branch: 'stable/rocky'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
+
+- project:
+    name: netvirt-csit-upgrade-openstack-integration-stein
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+
+    stream:
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+
+    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'
+    group-add-mod-enabled: 'true'
+    odl_system_flavor: odl-highcpu-2
+    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'
+
+    functionality:
+      - upgrade:
+          schedule: '{schedule-weekly}'
+      - upgrade-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
+
+    openstack:
+      - stein:
+          openstack-branch: 'stable/stein'
+          odl-ml2-branch: 'stable/stein'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_stein_system_image}'
+          openstack_system2_image: '{openstack_stein_system_image}'
+
+- project:
+    name: netvirt-csit-upgrade-openstack-integration-stein-aluminium
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+
+    stream:
+      - aluminium:
+          branch: 'master'
+          jre: 'openjdk11'
+
     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
+    group-add-mod-enabled: 'true'
+    odl_system_flavor: odl-highcpu-2
+    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:
@@ -24,14 +176,16 @@
           install-features: 'odl-netvirt-openstack'
 
     functionality:
-      - upgrade
+      - upgrade:
+          schedule: '{schedule-daily}'
       - upgrade-snat-conntrack:
           odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
 
     openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
+      - stein:
+          openstack-branch: 'stable/stein'
+          odl-ml2-branch: 'stable/stein'
           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_stein_system_image}'
+          openstack_system2_image: '{openstack_stein_system_image}'