From: Anil Belur Date: Thu, 1 Apr 2021 22:37:21 +0000 (+0000) Subject: Merge "Update cloud image CentOS7 builder x86_64" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2a29d790d0958eec9b33113757f75b30593e55b6;hp=01b5df75f732deb85d110058a8c5543fed1728af;p=releng%2Fbuilder.git Merge "Update cloud image CentOS7 builder x86_64" --- 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 d49cab9ab..7e4888468 100644 --- 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 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg index 3fe778c1f..3574e52b7 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-2c-2g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg index 61e2e810d..c38bb9604 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809 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 e0bcabe0c..7a15b9eb0 100644 --- 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 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg index 7c7ce78b7..e38ee2904 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-4c-4g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg index deafb6f35..7e77396d6 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-8c-8g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809 HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index 64c603d33..b53355dd4 100644 --- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg +++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg @@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809 HARDWARE_ID=v3-standard-2 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229 USER_DATA_ID=jenkins-init-script diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 97156d9e4..91e05fce3 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -77,7 +77,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809" controller-max-mem: "2048m" tools_system_count: "1" tools_system_flavor: "v3-standard-2" @@ -185,7 +185,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809" controller-max-mem: "2048m" tools_system_count: "1" tools_system_flavor: "v3-standard-2" @@ -493,7 +493,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809" controller-max-mem: "2048m" tools_system_count: "1" tools_system_flavor: "v3-standard-2" @@ -604,7 +604,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809" controller-max-mem: "2048m" tools_system_count: "1" tools_system_flavor: "v3-standard-2" @@ -913,7 +913,7 @@ odl_system_count: 1 odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809" controller-max-mem: "2048m" docker_system_count: "1" docker_system_flavor: "v3-standard-2" @@ -1047,7 +1047,7 @@ odl_system_count: 1 odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809" controller-max-mem: "2048m" openstack_system_count: 1 openstack_system_flavor: "v3-standard-4" @@ -1477,7 +1477,7 @@ odl_system_count: 1 odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809" controller-max-mem: "2048m" openstack_system_count: 1 openstack_system_flavor: "v3-standard-4"