CI: Update CentOS 7 devstack stein image

[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 524c4d5443ba88f2382c87ea38087372cb31fb7d..24b0e067dfe8b17c1395a2fa087dc2ac483d55c3 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -1,75 +1,25 @@
 ---
-- project:
-    name: netvirt-csit-upgrade-openstack-integration-rocky
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-
-    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'
+    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
+          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: v3-standard-2
+    openstack_system_flavor: v3-standard-8
+    openstack_system2_flavor: v3-standard-4
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -78,45 +28,43 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
 
     functionality:
-      - upgrade:
-          schedule: '{schedule-daily}'
+      - upgrade
       - upgrade-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          odl-snat-mode: "conntrack"
 
     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}'
+          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'
+    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
+      - aluminium:
+          branch: "stable/aluminium"
+          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: v3-standard-2
+    openstack_system_flavor: v3-standard-8
+    openstack_system2_flavor: v3-standard-4
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -125,45 +73,43 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
 
     functionality:
-      - upgrade:
-          schedule: '{schedule-weekly}'
+      - upgrade
       - upgrade-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
 
     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}'
+          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
+    name: netvirt-csit-upgrade-openstack-integration-stein-master
     jobs:
       - inttest-csit-openstack-custom
 
-    project: 'netvirt'
+    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
+      - master:
+          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: v3-standard-2
+    openstack_system_flavor: v3-standard-8
+    openstack_system2_flavor: v3-standard-4
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -172,20 +118,18 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
 
     functionality:
-      - upgrade:
-          schedule: '{schedule-daily}'
+      - upgrade
       - upgrade-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          odl-snat-mode: "conntrack"
 
     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}'
+          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}"