Merge "Update cloud image Ubuntu18.04 mininet ovs"

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 3e5b61dcdccabc157b09188d20c39ab613b245ae..19e24a889bf268aff32d17b5f446512708bb2ba0 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 - 20221101-220103.978
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
 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 58913d1cbee6b3ee897c91656f79bfb029a7be65..a8cf5bfe2671ad8f2d35a1c1decd8fd08e25e49a 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 - 20221101-220103.978
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
 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 3723fe3c78d612f172e53b44ab72392dab0e37e6..7dd93b5d59f50c78cd29bab592baab983b4ebdd0 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 - 20221101-220103.978
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
 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 1136fe1a303c1ff6c6220b80d1977000f9ba7d84..511b39405a884675cfb9630b11d523d18770a506 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 - 20221101-220103.978
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
 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 3d7f399a0c7026043d9b394501c47d3250879d02..fbee230d732287933b8c713e42457f364b1691e8 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 - 20221101-220138.675
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221201-220143.533
 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 eee383c52a08079bb21bd0243955bcd5a4c26f5c..d414f0ea3e60c1954ea05c9bd1ba93f0bc15b6f1 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 - 20221101-160106.524
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
 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 92e924419291f7e41e5e92563a17ab0e1e21ee45..3967fcdd881b273136db8fd6db9fc8f481d40538 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 - 20221101-160106.524
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
 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 ab010b9d07edfa01311226358a0bea62e35d2b0c..ad4bad61b84d1506e10768b6ba8a1831adac025e 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 - 20221101-160106.524
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
 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 aacc9b21fd1b1bb79078b4ba72d618781a5657d3..24fc32d71c5c2a7f6e1376737e7d8229caa512b5 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 - 20221101-160106.524
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
 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 fae519a9c70d8858b07b6d001f4f62c08a82f1a0..c2453bc454a4078f314f0e01fa1531dad023f506 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 - 20221101-160106.524
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
 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 e009fd12d1bfda530e7e51f094cb95c9bdc94508..c0dc96faa452b4299c07bd91e3d012ab1c37c674 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 - 20221101-160106.524
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
 HARDWARE_ID=v3-standard-8

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 d7a73a33c1015f2edd3c35b3a10e63e8e6161b23..1492316bb129214a29dd6a86c6a9ad5cab882679 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 - 20221101-220138.675
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221201-220143.533
 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 52fe1dadee0ebf361e4cfd8b1cb7867fa96e7da0..dd8a9de82a6bd230ff1b461efe680dbe767bfb55 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 - 20221101-220138.675
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221201-220143.533
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 876244223b789b5a6045db5d79132f3d6fb552e9..2f5b1d0f3dcc7d033a455b66e99f978839199a65 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 Stream 8 - builder - x86_64 - 20221101-160106.524"
+    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560"
     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 3acb7f6c7b5bfa7aad2470ffe2d8b21cdc370776..a82f5f4ad2551b34be5e1d25f03b573ddffeef56 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 - 20221101-220103.978"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396"
 
     #####################
     # Job Configuration #

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 7c3b930997d7755069fd8ee53a4693b51730e14a..dae2f4b56d61dc187374b8edec81fd9354a5c474 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -30,6 +30,7 @@
       - gerrit-maven-clm:
           nexus-iq-namespace: odl-
           nexus-iq-stage: release
+          mvn-opts: "--add-opens java.base/java.util=ALL-UNNAMED"
 
       - gerrit-maven-merge:
           build-timeout: 180