X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack-upgrade.yaml;h=361635ddb82fa2e802419ae09286350357f5bf05;hb=4f8152aefad00f771fa5d79f4d3fb7c486ea363b;hp=35c3f93e66ac309ca5bec17b795bcadec269d70b;hpb=853876f42d8d8269a056c56eecc91f459e6edfbd;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 35c3f93e6..361635ddb 100644
--- 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:
@@ -82,10 +33,10 @@
 
     functionality:
       - upgrade:
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - upgrade-snat-conntrack:
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
 
     openstack:
       - rocky:
@@ -106,6 +57,9 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
 
     testplan: "{project}-{topology}-openstack-upgrade.txt"
     odl-ml2-driver-version: "v2"
@@ -143,14 +97,14 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-upgrade-openstack-integration-stein-aluminium
+    name: netvirt-csit-upgrade-openstack-integration-stein-silicon
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
 
     stream:
-      - aluminium:
+      - silicon:
           branch: "master"
           jre: "openjdk11"