Merge "Update cloud image CentOS7 builder x86_64"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 04561787f95b58043cd7d6daa94e61580bbf88b5..91e05fce3078d34f926e0809209f506a3acc8188 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -76,11 +76,11 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_flavor: "v3-standard-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
+    tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     #####################
@@ -184,11 +184,11 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_flavor: "v3-standard-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
+    tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     #####################
@@ -492,11 +492,11 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_flavor: "v3-standard-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
+    tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     #####################
@@ -603,11 +603,11 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_flavor: "v3-standard-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
+    tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     #####################
@@ -912,11 +912,11 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_flavor: "v3-standard-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     docker_system_count: "1"
-    docker_system_flavor: "odl-standard-1"
+    docker_system_flavor: "v3-standard-2"
     docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955"
 
     #####################
@@ -1046,17 +1046,17 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_flavor: "v3-standard-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     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"
+    openstack_system2_flavor: "v3-standard-2"
     openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     tools_system_count: 1
-    tools_system_flavor: "odl-highcpu-2"
+    tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     #####################
@@ -1476,17 +1476,17 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_flavor: "v3-standard-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     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"
+    openstack_system2_flavor: "v3-standard-2"
     openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     tools_system_count: 1
-    tools_system_flavor: "odl-highcpu-2"
+    tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     #####################