Merge "Clean bashisms in jjb integration-set-variables.sh"

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 27cc9b2faf6775c0e56a268858eb6077f0f09884..be986aa05d54bf1100ef3dbea0b516fe55f95fcc 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 - 20220401-060107.331
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412
 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 4bd7d664a031d4d10d79132fcc1efa27a000c654..7fa77b03a2c9a18e35265445b27e27f59be1ba34 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 - 20220401-060107.331
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412
 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 702b82970fbc2af9ffc4b47ac4d924ff49e92395..17e84759a1135e14a1eb3920a248e072f204602d 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 - 20220401-060107.331
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412
 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 4ff4a0c3564ed29d3ff4314a91bfdc953b7c2b5a..0da5c614cfe2753d9904a6759de8f6c1165bc543 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 - 20220401-060107.331
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412
 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 29b23184801075e05849d7ea2a57b1b35f001516..fc8b1c8d20b354cf5222684d9efb5a0cbb7be21a 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 - 20220401-060107.331
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412
 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 f6ba7f6ceefa55e69b36c8ac85e5c09f3da8254e..68c86077505ae82a87c4f14cde283e72277ea0ed 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 - 20220401-060107.331
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412
 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 814136189d019a18d7d53b626b7899112026f93c..4c573f20d9ee4592d059f4256c762d966769a98c 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 - 20220401-220102.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220811-110637.413
 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 78c4afdcf5826bd288cc85a2953431778494dc92..c3148129ce3e46e70062b21baa0197d30e3d3cdf 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 - 20220401-220102.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220811-110637.413
 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 85b4a06a44f118ac9b95d77e4a07b9632cb9719d..214de6571b1e27fd0283e2b5372861253956ae67 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 - 20220401-220102.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220811-110637.413
 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 3d6d1e6a40254450e587bd563e13b56f6748d97d..f69b6e0c1d165101aca4ee5779e3dacf4667ca50 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 - 20220401-220102.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220811-110637.413
 HARDWARE_ID=v3-standard-4

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 84cf699e131aa72fde751948ccc4d8c88ab85d55..106a8a48117f423067f6cb075e800441f57b1b62 100644 (file)
--- 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 - 20220401-000138.473
+IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20220811-110654.568
 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 a5cbe04c5164d97cabb617ec437da5aa0fd7a4f4..ac68fcc77af75756ef519a1714147c1d6a46b2b5 100644 (file)
--- 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 - 20220401-000138.473
+IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20220811-110654.568
 HARDWARE_ID=v3-standard-4

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 a55246036f7ee1f339b2bcd7b6174e23a1f56e83..70774c30d0cb668ba74586ba1e1fa3c54c1c5a32 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 - 20220801-160143.906
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220811-073719.385
 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 732c19d8f24eb1a6c92bfc05f524e31b50dd9399..61b273a135667fd5d42243d7b6ec5eb1dfbc802d 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 - 20220801-160143.906
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220811-073719.385
 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 1457dd213cb674b54a884b6bc88021d9df2a42b3..bdbc141a29a9b73943a1b7c4ce734be44ad77f07 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 - 20220801-160143.906
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220811-073719.385
 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 ef986a3a366436ebdc488efea77dae5d23bf568b..e6f3cfadbefe8c477e7b35a72b1a860f707da756 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 - 20220801-160143.906
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220811-073719.385
 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 757bd2cb8d59a7971259e616eb545fedb438b8f9..0ed6798af0d87a4464ba660e640ec984f805dbe5 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 - 20220801-160143.906
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220811-073719.385
 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 05407f4653be9bc75871ed24b863e5d69df2c0cb..c589e15742a8dd861105d2193f851297b8cab58e 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 - 20220801-160143.906
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220811-073719.385
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index eceb4781ecafeb5c37059e0231eab1f5908adbfd..bb8dffd6f9b6675b80c6375c797114a580a68eed 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 - 20220401-060107.331
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412
 AVAILABILITY_ZONE=nova
 HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg
index ad83a23ca716068e610551c84024671bf3641827..4dec66b83da0e4a66271dcae866d0876a1eb24ee 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220501-140101.102
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220811-112321.717
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-4c-4g.cfg
index 54a06f5820d879b32dd3ef31ae5d6dace0157529..64fc9901a9a13be41306196cc13bd41b94b25c8a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220501-140101.102
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220811-112321.717
 LABELS=ubuntu1804-helm-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 31c028752f92d4308a813ab0120cd6aa758c4b53..9f9d3f4e70abb0de4b72d4fba5318d0f3206332a 100644 (file)
--- 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 7 - builder - x86_64 - 20220401-060107.331"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
@@ -113,7 +113,7 @@
     tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220801-180111.774"
     openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20220401-010109.230"
-    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20220401-000109.037"
+    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20220811-110620.848"
     openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20210120-225008.045"
 
     # Default Robot framework options

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 8bc06a78213efd016385d32f0ef2917b665fed61..6e13844bcd0a7d705f5da95dc0c63122f980550d 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -885,7 +885,7 @@
 
     docker_system_count: "1"
     docker_system_flavor: "v3-standard-2"
-    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20220401-220102.840"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20220811-110637.413"
 
     #####################
     # Job Configuration #

diff --git a/packer/common-packer b/packer/common-packer
index 1bbdb3b9477f25d71bc75862d9fb6f3aa69a924a..ae3a1a9c4bb342170ef883da033646811ac703a3 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 1bbdb3b9477f25d71bc75862d9fb6f3aa69a924a
+Subproject commit ae3a1a9c4bb342170ef883da033646811ac703a3