Migrate jobs from odl-highcpu-* flavors to v3

[releng/builder.git] / jjb / netvirt / netvirt-csit-multi-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 5d7124ddb8942bfdb01f26f5d9e260cda30a40e9..c80780b6a6507389980fd2d4a47a3e2bb13a520f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -13,9 +13,9 @@
     enable-openstack-services: "placement-api,tempest"
     enable-openstack-compute-services: "placement-client"
     security-group-mode: "stateful"
-    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: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -86,7 +86,8 @@
     name: netvirt-csit-openstack-integration-silicon-stein
     jobs:
       - inttest-csit-openstack-custom
-
+    #temporarily disabling Stein jobs
+    disable-job: true
     project: "netvirt"
     stream: "silicon"
     branch: "master"
@@ -181,7 +182,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -253,6 +254,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disable-job: true
     project: "netvirt"
     stream: "aluminium"
     branch: "stable/aluminium"
@@ -336,6 +339,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disable-job: true
     project: "netvirt"
     stream: "magnesium"
     branch: "stable/magnesium"
@@ -502,6 +507,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disable-job: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"
@@ -581,6 +588,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disable-job: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"