Merge "Do not trigger distribution build"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 2d47ec6e942c2775576fe7af959def689268890e..61d9bd5e569998b0809689c54fbb64bc6d530373 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -11,11 +11,15 @@ 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 - builder - x86_64 - 20240101-060132.845
 * 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 - x86_64 - 20240101-230119.558
 * 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 +45,8 @@ 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 - docker - x86_64 - 20240101-220119.494
 * 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
@@ -54,6 +60,8 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - robot - x86_64 - 20221101-220138.675
 * ZZCI - CentOS 7 - robot - x86_64 - 20221201-220143.533
 * ZZCI - CentOS 7 - robot - x86_64 - 20230301-220131.480
+* ZZCI - CentOS 7 - robot - x86_64 - 20230501-220152.957
+* ZZCI - CentOS 7 - robot - x86_64 - 20240101-220154.458
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220303-223622.243
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220405-005246.199
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-013651.819
@@ -70,9 +78,15 @@ 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 - 20230801-160108.418
+* ZZCI - CentOS Stream 8 - builder - x86_64 - 20231213-094027.766
+* ZZCI - CentOS Stream 8 - builder - x86_64 - 20240117-011746.201
 * 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 - CentOS Stream 8 - robot - x86_64 - 20240101-010215.978
+* ZZCI - CentOS Stream 8 - robot - x86_64 - 20240116-014504.639
 * ZZCI - OPNFV - apex - compute - 0
 * ZZCI - OPNFV - apex - compute - 1
 * ZZCI - OPNFV - apex - controller - 0
@@ -93,6 +107,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230301-040106.351
 * ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230401-040112.177
 * ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925
+* ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675
 * ZZCI - Ubuntu 18.04 - helm -  - 20210513-214525.779
 * ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220501-140101.102
 * ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220811-112321.717
@@ -113,4 +128,5 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230301-180106.402
 * ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230401-180107.945
 * ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230501-180106.320
+* ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230601-180106.003
 * ZZCI - Ubuntu 22.04 - devstack - x86_64 - 20231031-095146.118

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 c919338f89c39e6e022578d6ddb0762c5add4ae7..d7c9e6ccfb8ce01e7d33e6a5dd8a63f786a2d4b2 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 - 20230501-060110.287
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845
 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 3b50f27fa3f62f835f022d6da925f0f05d010840..a10267ba1392a6e5b713a850f1c8bee95142aa45 100644 (file)
--- 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 - 20230501-060110.287
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845
 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 d74f7c2769f31a23d3816b29e7e36f79ef03bf2d..5fcc43c0eb093ddb5e325ab252b97fb753256f5c 100644 (file)
--- 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 - 20230501-060110.287
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845
 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 79f18eec090b13ffe9866f92648a92d50956a668..7afcfd8aca26f14db0066489e72f05ebd1f33f07 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 - 20230501-060110.287
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845
 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 e555f191b38bef2daa3c7626308642f2396476fb..dda109237ce93c1ff14d780cceb625845b37c313 100644 (file)
--- 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 - 20230501-060110.287
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845
 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 3a75990146238c9f45e082e27e6ad78f6dcc6283..822c6f2aed157cf7d1213be5016a9601d0d8adec 100644 (file)
--- 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 - 20230501-060110.287
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845
 HARDWARE_ID=v3-standard-8

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..0a3a0d7c036953a79536fbd0651f92a1a5ef0d7a 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 - 20240101-220119.494
 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..c00bd80bcfeb8806b322abe419ea72498d9855d0 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 - 20240101-220119.494
 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..3280d871559da9da49cb9c54776e11bb039c97d5 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 - 20240101-220119.494
 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..d623bf53fbba457295b0f14d0aa72296999dc578 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 - 20240101-220119.494
 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 bdfba145c5fb84b62409d2b80ffe8094753845d6..7814bb5d751a4b3ca86f808776b19c56bff40572 100644 (file)
--- 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 - 20230501-220152.957
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20240101-220154.458
 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 55ad810f4677887e1ab3ac6ad2439271d6e51451..a6cd43b20dec2810ed632080cf8e673dacb716b3 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 Stream 8 - builder - x86_64 - 20230727-135233.501
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240117-011746.201
 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 f3d99ca8f5d8c2202ac600dfac12e102c8b35c4d..d0280a30faacab8050a8f2b26bb377e78cd364cf 100644 (file)
--- 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 - 20230727-135233.501
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240117-011746.201
 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 5477f691cccda9a98d6988e16a8c0c09d33132cd..b138b90b6ff11a484f40847b45575c1c2b4f0699 100644 (file)
--- 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 - 20230727-135233.501
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240117-011746.201
 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 6830cf6909747b96ac6a2383b54a6f68f1a079e9..fc210c4ffdc5ce7cc681fa6b0ba20b4401993ddd 100644 (file)
--- 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 - 20230727-135233.501
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240117-011746.201
 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 b899128267c61747e15d1bf9aab37d9db5b7f489..2fb67beada9c12a50d379638cbc107001edb3564 100644 (file)
--- 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 - 20230727-135233.501
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240117-011746.201
 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 28610ebd35e8cdf756502f6ba26c7d9709983251..18b78f762f7183aca4ffb59eae218147e81a38ef 100644 (file)
--- 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 - 20230727-135233.501
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240117-011746.201
 HARDWARE_ID=v3-standard-8

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..cada79508e68836f0babfdb0f0511120b2d433dd 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 - 20240116-014504.639
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=16

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index ad64ac6a92ba01662ce16737902728afc338d701..7400de79255e81d7600c1c5e20dcc32af56fd072 100644 (file)
--- 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 - 20230501-060110.287
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845
 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 b24cf1708f18e7c0088dd2a23a81998a84afa74b..d60e89219dd501c904273906866c9e11796a1bbf 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 - 20230501-220152.957
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20240101-220154.458
 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 1ad852e313ae28f3d73bbb861efbfb5a045c208a..db0c3e4f62e7cd7246b1698a46cfbcb056728e7c 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 - 20230501-220152.957
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20240101-220154.458
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg
index 8800a2c8bb0bafd323ce280e4b51c78a8d927ba6..59e3f445f05b65e2168529ba8294cdff2b607e2f 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-docker-2c-2g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg
index e4068171631b6733411b58a64238640b7fb14a46..bc0a9dca2222243a69c80d968d22361e029d0cb6 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-docker-4c-4g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
index 8989527b06898ef6eb2341c8493115f35495e7ec..eb5ee8532735e4880a4bbb27648c2eb33e988a2b 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-mininet-ovs-28-1c-4g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230501-180106.320
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230601-180106.003
 HARDWARE_ID=v3-standard-2

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 9b4f5c45b9075bdd21d3bf9da01aa115f9d4bbf6..692c29090edd57c49fd9c9d6bde74f8251a907d5 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -24,7 +24,7 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-7.0.x
+    name: controller-8.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
@@ -34,10 +34,10 @@
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
-    stream: 7.0.x
+    stream: 8.0.x
     project: "controller"
     project-name: "controller"
-    branch: 7.0.x
+    branch: 8.0.x
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pdocs"
     build-timeout: 90
@@ -48,7 +48,7 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-6.0.x
+    name: controller-7.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
@@ -58,10 +58,10 @@
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
-    stream: 6.0.x
+    stream: 7.0.x
     project: "controller"
     project-name: "controller"
-    branch: 6.0.x
+    branch: 7.0.x
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pdocs"
     build-timeout: 90

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index e5698001c57ddb982d8d2375d3a0d238c0a1c241..67da04d8a19923a0574d0d328de068e66cdafc97 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -101,20 +101,20 @@
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501"
+    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20240117-011746.201"
     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 - 20240101-230119.558"
     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 - 20240101-230119.558"
     openstack_system3_count: 1
     openstack_system3_flavor: "v3-standard-8"
     openstack_system3_image: "ZZCI - Ubuntu 22.04 - devstack - x86_64 - 20231031-095146.118"
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230501-180106.320"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230601-180106.003"
     openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20221101-010107.368"
     openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20221101-000109.537"
 

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 6886e0e56ce7c9685db6cd74de54c90fabfd7cd6..f1564609d13abc297bcc5ebe587ae1409e802b31 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 - 20240101-220119.494"
 
     #####################
     # Job Configuration #

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index ec8d1bf68abf11fd04a9f933a80471e3d85ab96c..b2045821d4ba5fcbfd18022183b0ffd89f9fab73 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -89,36 +89,6 @@
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
-- project:
-    name: mdsal-10.0.x
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos8-builder-2c-2g
-          project-pattern: mdsal
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
-          rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
-
-    project: mdsal
-    project-name: mdsal
-    branch: 10.0.x
-    stream: 10.0.x
-
-    mvn-settings: "mdsal-settings"
-    build-timeout: 60
-
-    archive-artifacts: >
-      **/*.prop
-      **/*.log
-      **/target/surefire-reports/*-output.txt
-      **/target/failsafe-reports/failsafe-summary.xml
-      **/hs_err_*.log
-      **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
 - project:
     name: mdsal-release-management
     jobs:

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 48668270391565bcb9b22e9344d9ee28f9945dcf..971c6e1a46aa438346c66ce06e722edd61b9c8cc 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -25,7 +25,7 @@
           scope: "only"
 
     # no mininet required
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675"
 
     # Features to install
     install-features: "odl-netconf-callhome-ssh,odl-restconf"

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index a6870ae3aad1f229ff4d63603eb3e92966654e28..7f3bef1b16969f0f5e4942dce46cc05f39178a54 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -24,7 +24,7 @@
       - all:
           scope: "all"
 
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675"
 
     # Features to install
     install-features: >

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 031dcbf5c4f75d84280bd5d9b31f227389ac8c89..767042b309ede5af0c4cd96cc31a1636dff4a942 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -65,39 +65,6 @@
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
-- project:
-    name: odlparent-11.0.x
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos8-builder-2c-2g
-          doc-dir: .tox/docs/tmp/html
-          project-pattern: odlparent
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
-          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 11.0.x
-    branch: 11.0.x
-
-    mvn-settings: odlparent-settings
-
-    dependencies: ""
-    email-upstream: "[odlparent]"
-    archive-artifacts: >
-      **/*.prop
-      **/*.log
-      **/target/surefire-reports/*-output.txt
-      **/target/failsafe-reports/failsafe-summary.xml
-      **/hs_err_*.log
-      **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: 880d5ac25eaa
-
 - project:
     name: odlparent-release-management
     jobs:

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index 9d20df106d0d918da841330b841268cc677a3579..f228a01835813f9780c5ae8b67cf6573902087ce 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -27,6 +27,7 @@
     platforms:
       - centos-7
       - centos-cs-8
+      - centos-cs-9
     templates: builder
     update-cloud-image: true
 
@@ -189,6 +190,7 @@
     platforms:
       - centos-7
       - centos-cs-8
+      - centos-cs-9
     templates: robot
     update-cloud-image: true
 
@@ -203,7 +205,7 @@
     archive-artifacts: "**/*.log"
     jenkins-ssh-credential: "opendaylight-jenkins-ssh"
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     # update-cloud-image: true
     build-timeout: 10
     submodule-disable: true

diff --git a/packer/common-packer b/packer/common-packer
index 169d91b941909003cecb9dc43fc9c6adeaa686ae..d4e1f792fb08af9a269710d0bca7c50b53eb5ec8 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 169d91b941909003cecb9dc43fc9c6adeaa686ae
+Subproject commit d4e1f792fb08af9a269710d0bca7c50b53eb5ec8