Merge "Migrate jobs from v1-standard-* flavors to v3"

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
index ba42d6318cf7cba46889d3d2ebeecb03ea2074af..d49cab9ab6a0c575d3bdb147745bbb54575ca2bf 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index a7c9327f170a02edb7f6fc61d8ffe09ab96170ab..e0bcabe0cab165076a891fedc1723140667434de 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
-HARDWARE_ID=odl-standard-4
+HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
index 5d522f969952c0e6744a846edd0978d855d204b4..b33cc895f6abf4fc49200eb23000218482d0f029 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-1g
 IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 866102ecab08b8135bd9551c47e51a2cf817cb92..64c603d3349462ef2460a0fd18a3dafdb559cc53 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -6,7 +6,7 @@ CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
 INSTANCE_CAP=75

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
index e66c52e9f056182c440424ae860662e47b0bcbae..597ca06368c6998b94818b6be831f0e1a6476b1d 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
@@ -1,4 +1,4 @@
 LABELS=queue-disttest-2c-1g
 IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
index f4f2a9c7ba2e97cc5098a9afcdca61eab20d353a..457bd62ee3a8a1ea212785e2e60d8d620ed50d88 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
@@ -1,5 +1,5 @@
 LABELS=queue-intque-2c-1g
 IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index e4ef3b03a7b1ef1f749c7d0efd3db5be1f698168..1c2b4594cac32544b6a10202b48f19a82db04792 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -48,7 +48,7 @@
       -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
     # Plot Info
     01-plot-title: "Number of generated updates"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index fafc4c483b7fe79bbec699cc0d2dc73d6c651cab..a354549042ddb21ad4ad041cdfa5d07708a5740b 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -47,4 +47,4 @@
       -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index ee582587d41f0c60b8e8a04179f478da38b644f3..d0952e986779bce08ce70a66d14760e072838f05 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -36,4 +36,4 @@
     robot-options: "-v USE_NETCONF_CONNECTOR:False"
 
     # Controller configuration
-    odl_system_flavor: "odl-standard-4"
+    odl_system_flavor: "v3-standard-4"

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 878165f7ef13e13132f72675e6f8b7f67e0220d3..aa6b5cba44ac094eac57f16fd0bda4f5f5df4d1f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -42,4 +42,4 @@
       -v UPDATER_TIMEOUT:900
 
     # Controller configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index e09d091ce5bcf3eecdc722d88f5da3cec5743f44..32907037b2d16a18d8d9baa32c05a65b9d2a7f94 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -36,7 +36,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: "odl-standard-4"
+    odl_system_flavor: "v3-standard-4"
 
     build-timeout: "480"
 

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index db2ddc75afa156815ae90f49a76fdd33e1d4e070..9038123d094dc717fdf7ff6f770749f1f595fbfd 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -37,7 +37,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
     # Plot Info
     01-plot-title: "Performance by structure"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 04561787f95b58043cd7d6daa94e61580bbf88b5..5dd500dd13ec214b76287894371c56fb3faea001 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1050,7 +1050,7 @@
     odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
     controller-max-mem: "2048m"
     openstack_system_count: 1
-    openstack_system_flavor: "odl-standard-4"
+    openstack_system_flavor: "v3-standard-4"
     openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     openstack_system2_count: 0
     openstack_system2_flavor: "odl-standard-1"
@@ -1480,7 +1480,7 @@
     odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
     controller-max-mem: "2048m"
     openstack_system_count: 1
-    openstack_system_flavor: "odl-standard-4"
+    openstack_system_flavor: "v3-standard-4"
     openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     openstack_system2_count: 0
     openstack_system2_flavor: "odl-standard-1"

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index f35425af226b9eb69a74bfedab9d27c7902881a0..94ed4421fc41454167ed60cc331244991350ea44 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -30,7 +30,7 @@
     tools_system_count: 0
 
     # odl system flavor
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
     # Features to install
     install-features: "odl-restconf"

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 46efd0a09d277b009012aec4aac18239da08f700..050e557fbb59a66b18040a9127d2126f25e485e6 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -37,7 +37,7 @@
     robot-options: "-v USE_NETCONF_CONNECTOR:False"
 
     # ODL system configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
 - project:
     name: netconf-csit-scale-max-devices

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index af147a715ab61fc0e2f7b9916d50ed50080c2625..f842b4c62a4b4984b624ab83c2a1355e8eba2dca 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -15,7 +15,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-standard-4
+    openstack_system2_flavor: v3-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -182,7 +182,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-standard-4
+    openstack_system2_flavor: v3-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 9027fb1b44f8c75cdbf00750dd3d50092ebbb128..d6d6141c26d59a771ff023b9fc51e8e940b0c975 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -29,7 +29,7 @@
           scope: "only"
 
     # Job images
-    odl_system_flavor: "odl-standard-4"
+    odl_system_flavor: "v3-standard-4"
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     # Features to install

diff --git a/openstack-hot/csit-2-instance-type.yaml b/openstack-hot/csit-2-instance-type.yaml
index b601d9c2f1de645e97ff4e666b5e9c6b51199cdc..e1080473163f2d6ff0ecf81d06415412df6bde09 100644 (file)
--- a/openstack-hot/csit-2-instance-type.yaml
+++ b/openstack-hot/csit-2-instance-type.yaml
@@ -13,7 +13,7 @@ parameters:
     description: Number of VMs for 1st VM type
   vm_0_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 1st VM type
   vm_0_image:
     type: string
@@ -23,7 +23,7 @@ parameters:
     description: Number of VMs for 2nd VM type
   vm_1_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 2nd VM type
   vm_1_image:
     type: string

diff --git a/openstack-hot/csit-3-instance-type.yaml b/openstack-hot/csit-3-instance-type.yaml
index 421b3ff2f97ac2b46cb47d2e1c0531f5498833ee..fd5ae1f538a2eb88930fe39f92dcb0d4206e35c0 100644 (file)
--- a/openstack-hot/csit-3-instance-type.yaml
+++ b/openstack-hot/csit-3-instance-type.yaml
@@ -13,7 +13,7 @@ parameters:
     description: Number of VMs for 1st VM type
   vm_0_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 1st VM type
   vm_0_image:
     type: string
@@ -23,7 +23,7 @@ parameters:
     description: Number of VMs for 2nd VM type
   vm_1_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 2nd VM type
   vm_1_image:
     type: string
@@ -33,7 +33,7 @@ parameters:
     description: Number of VMs for 3rd VM type
   vm_2_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 3rd VM type
   vm_2_image:
     type: string

diff --git a/openstack-hot/csit-4-instance-type.yaml b/openstack-hot/csit-4-instance-type.yaml
index e7ca5a26561afcaa57116de922d15718d47855f2..33e16c6a699ed6b87872f949cc4dd3185d918d47 100644 (file)
--- a/openstack-hot/csit-4-instance-type.yaml
+++ b/openstack-hot/csit-4-instance-type.yaml
@@ -13,7 +13,7 @@ parameters:
     description: Number of VMs for 1st VM type
   vm_0_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 1st VM type
   vm_0_image:
     type: string
@@ -23,7 +23,7 @@ parameters:
     description: Number of VMs for 2nd VM type
   vm_1_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 2nd VM type
   vm_1_image:
     type: string
@@ -33,7 +33,7 @@ parameters:
     description: Number of VMs for 3rd VM type
   vm_2_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 3rd VM type
   vm_2_image:
     type: string
@@ -42,7 +42,7 @@ parameters:
     description: Number of VMs for 3rd VM type
   vm_3_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 3rd VM type
   vm_3_image:
     type: string

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index 223e33b78cbe59011dfdea06e5e550602d3e917a..15e834ad5491e0115f2998642fdcdf003af18f32 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -26,7 +26,7 @@ parameters:
     default: "0"
   vm_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: OpenStack Flavor to use
   vm_image:
     type: string

diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index c976afc234ec711557e5621659414e0a82372bcf..1e6ba9eacef694b4f20b8ce181f71eeb4a9edaff 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.json
@@ -26,7 +26,7 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "flavor": "v1-standard-1",
+      "flavor": "v3-standard-2",
       "metadata": {
         "ci_managed": "yes"
       }