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 35c3f93e66ac309ca5bec17b795bcadec269d70b..24b0e067dfe8b17c1395a2fa087dc2ac483d55c3 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -1,53 +1,4 @@
 ---
-- 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:
@@ -66,9 +17,9 @@
     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
+    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
@@ -81,11 +32,9 @@
           install-features: "odl-netvirt-openstack"
 
     functionality:
-      - upgrade:
-          schedule: "{schedule-daily}"
+      - upgrade
       - upgrade-snat-conntrack:
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
 
     openstack:
       - rocky:
@@ -103,8 +52,8 @@
     project: "netvirt"
 
     stream:
-      - magnesium:
-          branch: "stable/magnesium"
+      - aluminium:
+          branch: "stable/aluminium"
           jre: "openjdk11"
 
     testplan: "{project}-{topology}-openstack-upgrade.txt"
@@ -113,9 +62,9 @@
     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
+    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
@@ -128,11 +77,9 @@
           install-features: "odl-netvirt-openstack"
 
     functionality:
-      - upgrade:
-          schedule: "{schedule-weekly}"
+      - upgrade
       - upgrade-snat-conntrack:
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-weekly}"
 
     openstack:
       - stein:
@@ -143,14 +90,14 @@
           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"
 
     stream:
-      - aluminium:
+      - master:
           branch: "master"
           jre: "openjdk11"
 
@@ -160,9 +107,9 @@
     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
+    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
@@ -175,11 +122,9 @@
           install-features: "odl-netvirt-openstack"
 
     functionality:
-      - upgrade:
-          schedule: "{schedule-daily}"
+      - upgrade
       - upgrade-snat-conntrack:
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
 
     openstack:
       - stein: