Merge "Revert "Chore: Update CentOS Stream 8 image to latest""

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 85c275f32511d0371d3f287199d78cd39a684404..3fb0b905e8f915b6ebb822778eb90c85bb589cfb 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -11,11 +11,13 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 * ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
 * ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
+* ZZCI - CentOS 7 - builder - x86_64 - 20231213-090206.813
 * ZZCI - CentOS 7 - devstack - x86_64 - 20220401-230107.511
 * ZZCI - CentOS 7 - devstack - x86_64 - 20220915-220248.057
 * ZZCI - CentOS 7 - devstack - x86_64 - 20221016-125752.520
 * ZZCI - CentOS 7 - devstack - x86_64 - 20230301-230109.257
 * ZZCI - CentOS 7 - devstack - x86_64 - 20230401-230106.445
+* ZZCI - CentOS 7 - devstack - x86_64 - 20231213-111336.211
 * ZZCI - CentOS 7 - devstack-rocky - 20190601-000116.015
 * ZZCI - CentOS 7 - devstack-rocky - 20190628-065204.973
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
@@ -41,6 +43,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - docker - x86_64 - 20230301-220107.956
 * ZZCI - CentOS 7 - docker - x86_64 - 20230401-220108.252
 * ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
+* ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823
 * ZZCI - CentOS 7 - helm - x86_64 - 20220401-000138.473
 * ZZCI - CentOS 7 - helm - x86_64 - 20220811-110654.568
 * ZZCI - CentOS 7 - helm - x86_64 - 20220915-220356.090
@@ -71,9 +74,11 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501
+* ZZCI - CentOS Stream 8 - builder - x86_64 - 20231213-094027.766
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20220811-231817.668
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20230301-010147.625
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20230401-010209.151
+* ZZCI - CentOS Stream 8 - robot - x86_64 - 20231213-111243.663
 * ZZCI - OPNFV - apex - compute - 0
 * ZZCI - OPNFV - apex - compute - 1
 * ZZCI - OPNFV - apex - controller - 0

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
index 6a0ec162528fda44662613c3ce7056b16026eb38..4df5983d9c61d45e7a49ceb6ba495b6d9de0d457 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-1c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
index 0f6e8b779a6458cfaf7f28e7c51fe9b74b9b21ce..82d2c79e8408a60dd41c940c46182fa0ddce64c5 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
index 795a3f4ae2c46a61c2257f2878f3703cde400c52..92cb734596e67489cbd9b821778d8434c0ff8e81 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg
index 420fea9c157b3b84deeb23e7f6a7916070d54d95..2237e57d6bc827a36fbc49f057af8f61f4182f02 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg
index de90af4fb5969bdf8627fd6d522d70bb3141ad6d..eb36e13073149fdf6d027dc2d1191d20b1e985dc 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg
@@ -1,4 +1,4 @@
 LABELS=centos8-robot-2c-8g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - robot - x86_64 - 20230401-010209.151
+IMAGE_NAME=ZZCI - CentOS Stream 8 - robot - x86_64 - 20231213-111243.663
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=16

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index e5698001c57ddb982d8d2375d3a0d238c0a1c241..d6910bafc4d50573a3a169acb8ecbc4d1500a725 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -105,10 +105,10 @@
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20230401-230106.445"
+    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20231213-111336.211"
     openstack_system2_count: 0
     openstack_system2_flavor: "v3-standard-2"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20230401-230106.445"
+    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20231213-111336.211"
     openstack_system3_count: 1
     openstack_system3_flavor: "v3-standard-8"
     openstack_system3_image: "ZZCI - Ubuntu 22.04 - devstack - x86_64 - 20231031-095146.118"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 6886e0e56ce7c9685db6cd74de54c90fabfd7cd6..7776ee1eaa331df9f59d947cf2d0409c2c895661 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -832,7 +832,7 @@
 
     docker_system_count: "1"
     docker_system_flavor: "v3-standard-2"
-    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823"
 
     #####################
     # Job Configuration #