From: Anil Belur Date: Mon, 17 Oct 2022 08:51:58 +0000 (+0000) Subject: Merge "Update cloud image CentOS7 docker x86_64" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9d02ac334e7aab461ac438314f9bd94982b6e0ee;hp=8a16f6929dc15bbebc295512bcb4a3a5c641aeca;p=releng%2Fbuilder.git Merge "Update cloud image CentOS7 docker 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 407e3c092..04e4ed659 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 - 20221014-230023.599 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194 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 e49070355..4f863eab5 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 - 20221014-230023.599 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194 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 56005ac13..06dc308ba 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 - 20221014-230023.599 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194 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 b9681677b..9fb822114 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 - 20221014-230023.599 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194 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 5137c48f3..6f8f73181 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 - 20221014-230023.599 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194 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 36cef0b33..987039028 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 - 20221014-230023.599 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194 HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-helm-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-helm-2c-2g.cfg index 26e23aeb0..1a5f8cbf6 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-helm-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-helm-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-helm-2c-2g -IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20221016-125903.888 +IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20221016-223030.291 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-helm-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-helm-4c-4g.cfg index f89cc0202..b67076778 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-helm-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-helm-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-helm-4c-4g -IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20221016-125903.888 +IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20221016-223030.291 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg index de14a60ca..0dddd11c8 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-robot-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221016-125928.502 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221016-223041.341 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=16 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 360bafd2a..7ad7a70a2 100644 --- 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 Stream 8 - builder - x86_64 - 20221013-083604.413 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221016-222440.331 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg index fc79791f3..6e72e2ad3 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-2c-2g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-083604.413 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221016-222440.331 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg index f7a842fa3..f984d5313 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-2c-8g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-083604.413 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221016-222440.331 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg index 6bde5b757..b46e87b02 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-4c-16g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-083604.413 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221016-222440.331 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg index 6c40d5b50..31b1ae2ec 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-4c-4g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-083604.413 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221016-222440.331 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg index 5e3579256..c7954c167 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-8c-8g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-083604.413 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221016-222440.331 HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index b3f061401..d3eca9499 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 - 20221014-230023.599 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194 AVAILABILITY_ZONE=nova HARDWARE_ID=v3-standard-2 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229 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 049aea49d..43ce01228 100644 --- 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 - 20221016-125928.502 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221016-223041.341 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 94bb6baa3..ba081df5d 100644 --- 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 - 20221016-125928.502 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221016-223041.341 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=1 NUM_EXECUTORS=4 diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index f2d3c63ac..8f89d5cd7 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -101,7 +101,7 @@ # CSIT configuration odl_system_count: 1 odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-083604.413" + odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20221016-222440.331" controller-max-mem: "2048m" openstack_system_count: 1 openstack_system_flavor: "v3-standard-4" @@ -112,7 +112,7 @@ tools_system_count: 1 tools_system_flavor: "v3-standard-2" tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20221013-083654.129" - openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20220915-222435.096" + openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20221016-222956.928" openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20221016-125827.911" # Default Robot framework options