Merge "Update cloud image"

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 451a5a296005c471801933a676602b1bdd42e7e2..27cc9b2faf6775c0e56a268858eb6077f0f09884 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 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 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 7113dd5bf198ef37af68c7f45a8618f6e076434d..4bd7d664a031d4d10d79132fcc1efa27a000c654 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 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 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 459654de0112f2948290fde55d80f7d5ea9a7b8d..702b82970fbc2af9ffc4b47ac4d924ff49e92395 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 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 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 07166980e1dc8926f084fce583900b5994ddfd0a..4ff4a0c3564ed29d3ff4314a91bfdc953b7c2b5a 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 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 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 e17fffe91632b6249654fbd4a6a6f33f1a4f406b..29b23184801075e05849d7ea2a57b1b35f001516 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 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 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 25a4186723884ccaeddb524c835d12c68877ced2..f6ba7f6ceefa55e69b36c8ac85e5c09f3da8254e 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 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 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 9c5a34c1cfc925423aac9260959ac8a2ad0c5c0a..84cf699e131aa72fde751948ccc4d8c88ab85d55 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 - 20211217-010326.708
+IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20220401-000138.473
 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 6725f5c95794d75fe957c69c7cfc14dd7b74af77..a5cbe04c5164d97cabb617ec437da5aa0fd7a4f4 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 - 20211217-010326.708
+IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20220401-000138.473
 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 694f60f05bfb0719b9f6f6859ea6e27547c9aa35..66bfdea1750599b0a2481827688a3c182a6ddc75 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 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 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 0ae153f8809cbf7d1e29d864aec439275edefbab..b3642ee762e0795e50aa1288bec91c85449e1f99 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 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 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 2c3f73262e58f95953996af701af480b4b6eed70..52c506cc845e42a32838ab2200771d62d5f1ae1f 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 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 HARDWARE_ID=v3-standard-2

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 319f0b09c6f9703d658a01fe05c6f0c2cec8aac6..18d6b0279c48c9616fa4af516c005665f9a72f98 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 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 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 9879e5b9e099e8279c5acdb59901f9754824b90a..26ebfe7c1fcd6b6acd3eb817bcd824779ec45a01 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 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 HARDWARE_ID=v3-standard-8

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

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 7c03236bd91128ac8bb81caaaa0ccb4c6ca71543..577edfe277ed9deca1ceed52889ba075dbb6710a 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 - 20220201-040158.287
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220501-040104.357
 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 2d44db571ce1c14db5dc4817826ded63972b4420..f40637b3ed090b071c7dca460c8c1cd799f5e5cd 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 - 20220201-040158.287
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220501-040104.357
 HARDWARE_ID=v3-standard-4

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 b1804d09e09eda86bda89161264fa7e746722339..ad83a23ca716068e610551c84024671bf3641827 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 - 20211215-222010.564
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220501-140101.102
 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 716052b37f3068df9d4af16d79082aa9bde098df..54a06f5820d879b32dd3ef31ae5d6dace0157529 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 - 20211215-222010.564
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220501-140101.102
 LABELS=ubuntu1804-helm-4c-4g
 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 29d1b79b6ae299f73c7acc98256fb043d45f5d29..8055fa06b431ba7b96a39df25338d9d7deb28cbc 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 - 20220201-180056.429
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220501-180100.971
 HARDWARE_ID=v3-standard-2

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index af9a9437c45784cfc3c134d2bf5ce8ad26e79796..c54c963a6a84e31cf8c2d52addb109d44fa5b73b 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 7 - builder - x86_64 - 20220101-060058.758"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
+    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20220401-230107.511"
     openstack_system2_count: 0
     openstack_system2_flavor: "v3-standard-2"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
+    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20220401-230107.511"
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220201-180056.429"
-    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20211001-010151.446"
-    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20211001-000220.740"
-    openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220501-180100.971"
+    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_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20210120-225008.045"
 
     # Default Robot framework options
     robot-options: ""

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 1953058ffa94821cc716ac8a1b12a3307d5232a3..2f250fc59bd9c4b7992bda668dea4a9db3bc175b 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 - 20220201-040158.287"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220501-040104.357"
 
     # 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 52792d1cb8f7e15ace56460126e57eff32297d98..652177997a1e7ec38382388a02a9de6af65f80f8 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -28,7 +28,7 @@
       - all:
           scope: "all"
 
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220201-040158.287"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220501-040104.357"
 
     # Features to install
     install-features: >