Merge "Install odl-restconf-nb-bierman02 for CSIT"

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 c1a63c527ccdd7e970a0447d849e09b498c2c3e4..451a5a296005c471801933a676602b1bdd42e7e2 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 - 20211001-123242.814
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
 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 7494a164791739dcc23ea13c51b6edc6d55ad938..7113dd5bf198ef37af68c7f45a8618f6e076434d 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 - 20211001-123242.814
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
 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 0330422cf32f964744ed5483c6838639cfac2f75..459654de0112f2948290fde55d80f7d5ea9a7b8d 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 - 20211001-123242.814
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
 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 b28a4ce97308c5c8fb411c217f25180abc4dc39e..07166980e1dc8926f084fce583900b5994ddfd0a 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 - 20211001-123242.814
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
 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 f47bcaea7ba6ea523419d9096bc313c8ff2ca081..e17fffe91632b6249654fbd4a6a6f33f1a4f406b 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 - 20211001-123242.814
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
 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 c08eba6f2cd9ae9b00e2f17ff48e43f2e11bef72..25a4186723884ccaeddb524c835d12c68877ced2 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 - 20211001-123242.814
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
 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 fed4d5f8e7a60ed4f7d9dcb4b93b3f81f6787edb..814136189d019a18d7d53b626b7899112026f93c 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 - 20211006-065328.122
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220401-220102.840
 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 6bb60afefe3fd3e33a9a1826f840f3312cf296d5..78c4afdcf5826bd288cc85a2953431778494dc92 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 - 20211006-065328.122
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220401-220102.840
 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 c5b04993b396f6a5f8dbf282aabc3c5065cddda7..85b4a06a44f118ac9b95d77e4a07b9632cb9719d 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 - 20211006-065328.122
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220401-220102.840
 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 504a5734e0bf5b8760fcf2afa1d6767417dc4587..3d6d1e6a40254450e587bd563e13b56f6748d97d 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 - 20211006-065328.122
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220401-220102.840
 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 09cbdcf908efb9e9bb51caf495723109a8364407..0f188d1c4f21fea2a83f6cdb5d90cb89f680d537 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 - 20211001-132202.905
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20220401-220138.484
 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 a30569d19b5225b407171b41994e5e0f4a37309e..47fb6e37879d897af853b688cbdef43afa86c9e9 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 - 20211001-123242.814
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
 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 5ae5aaad600e67cf0637a43b664413bfbca01151..6d4bae8d82ef0a5cbfb371f46a2caa4645696da5 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 - 20211001-132202.905
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20220401-220138.484
 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 2f42a3c0e6e19bbd0f73c4870b3536d7ee697e3d..64e105dcaa7abbf6b7bb0d38bca5aea849a04576 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 - 20211001-132202.905
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20220401-220138.484
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 65e706d7d830d416aed619dc13831e707b10f15d..f4e51b17a1a9c17c816d1fc4defdd33d6d9b0d5b 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 - 20211001-123242.814"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index e2d8bc3d3b3e9375d44c84cc116ddc3fd4dea453..4e90f52cc8bec315e427ee744a54e3f2b318dedc 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 - 20211006-065328.122"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20220401-220102.840"
 
     #####################
     # Job Configuration #

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