Merge "Update cloud image Ubuntu18.04 mininet ovs"

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 62af085c4c9f6d45354540a095ad20ea365b54c7..8ec456a3e6ce3875a0c4737b8d4645ee53bdad9c 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 - 20230301-060101.869
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
 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 3d342cd5496e0e94596d7dd3dca1d10c1f4d911d..7a8f051a6756d2d79af8c527c9a500a8a144854e 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 - 20230301-060101.869
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
 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 da9e3db33eadc8da13caacfdd59f69d8045d844d..df7b88fe7748303a2294f96eceda6401cbbd8e7c 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 - 20230301-060101.869
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
 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 4ed8f46471bbbbe862946ecd0d6ed3cd5146af94..96c6d6cf6fc5679da1708f356b71d595f64023f2 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 - 20230301-060101.869
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
 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 fd6ecbd22afd830268fb145b06f617c71e7e265a..3d6125e8ac27d1d5450e1da3393f8638bc37ef27 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 - 20230301-060101.869
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
 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 782bade473eafacfab2aef28d5c2d8b28f5caa59..413924145012f3a3e07b2a51e624e33d57f90543 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 - 20230301-060101.869
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
 HARDWARE_ID=v3-standard-8

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 45dc7ebbc3503fbbe8b579539884d8729015efe5..ccef3aaeb453543c012741be6e78bb6395382b41 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 - 20230301-160121.204
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
 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 2a81d714758056754ab1783ac68107125cb2b08f..333c47e4005e8aeafd06edc84b1a25c8f0b60e6b 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 - 20230301-160121.204
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
 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 4badc51595960ad229f832cb05520f6c2b98b1a9..9b96d08bb5ab27cc27f4d5afa38264b4eb839f10 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 - 20230301-160121.204
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
 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 18c04c4bbdfe1cb8fc8b319e71f78571d5b44b85..78a0bbb51b427570cc335dbd65db8b70af12c59f 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 - 20230301-160121.204
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
 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 f8ee30ec49278ec7998d9f8f3347e436efe12458..0c28a68ab252c853d83ab79c9e2568da9c479d1a 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 - 20230301-160121.204
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
 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 240b15a2d25666cd875ee618142303ff004cc4ce..9982f77003df27f73f900a5271c31b055ac98dc8 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 - 20230301-160121.204
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index b87f80538f50f4852066b78b4d4685b3de315bd0..26b0eaf6fc4cac166a866d3d9a21f27091bbb8e5 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 - 20230301-060101.869
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
 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 2e103ce86f9e552f4e1fe2e029e8f2291df72e72..2347a9dd7156893a8eb80e623291f57ffee95981 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 - 20230301-040106.351
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230401-040112.177
 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 e9d81969b94aceb8395c0e70c249d69a267e19be..c650700ee185ba5cfe0de8aa348f9fb4908e1dd1 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 - 20230301-040106.351
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230401-040112.177
 HARDWARE_ID=v3-standard-4

diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml
index 25ba3e5c860b56a1c07635e7403c4a755b276ec9..8a9cba4d38a401c867b6551c01e8ffaed3cfdf5b 100644 (file)
--- a/jjb/autorelease/autorelease-branch-lock.yaml
+++ b/jjb/autorelease/autorelease-branch-lock.yaml
@@ -88,8 +88,10 @@
     jobs:
       - "{project-name}-gerrit-branch-lock-{stream}"
     stream:
-      - argon:
+      - potassium:
           branch: "master"
+      - argon:
+          branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
       - sulfur:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 9804795d50b4fa8d47acc45dc481b3c0beb22764..634c51eefe5e39e5f51509c88b84efb32719a8d4 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -10,8 +10,10 @@
       - gerrit-tox-verify
 
     stream:
-      - argon:
+      - potassium:
           branch: "master"
+      - argon:
+          branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
       - sulfur:
@@ -67,8 +69,11 @@
       - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"
 
     stream:
-      - argon:
+      - potassium:
           branch: "master"
+          integration-test: potassium
+      - argon:
+          branch: "stable/argon"
           integration-test: argon
       - chlorine:
           branch: "stable/chlorine"

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 87bb4d38946641fb1264dc1c4555cfbc48194b05..3cd352606be61b97b50ed4d768699f42cf758d31 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -11,8 +11,10 @@
     build-node: centos7-builder-2c-8g
 
     stream:
-      - argon:
+      - potassium:
           branch: "master"
+      - argon:
+          branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
       - sulfur:

diff --git a/jjb/autorelease/validate-autorelease-argon.yaml b/jjb/autorelease/validate-autorelease-argon.yaml
index 78a5622c1dcc8e65a3547e32248e0cf79539bff7..b25eee4572526d44050157754b436e97336aaf90 100644 (file)
--- a/jjb/autorelease/validate-autorelease-argon.yaml
+++ b/jjb/autorelease/validate-autorelease-argon.yaml
@@ -5,7 +5,7 @@
     jobs:
       - "{project-name}-validate-autorelease-{stream}"
     stream: argon
-    branch: master
+    branch: stable/argon
     project-name:
       - daexim:
           project: daexim

diff --git a/jjb/autorelease/validate-autorelease-potassium.yaml b/jjb/autorelease/validate-autorelease-potassium.yaml
new file mode 100644 (file)
index 0000000..222af39
--- /dev/null
+++ b/jjb/autorelease/validate-autorelease-potassium.yaml
@@ -0,0 +1,23 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-potassium
+    jobs:
+      - "{project-name}-validate-autorelease-{stream}"
+    stream: potassium
+    branch: master
+    project-name:
+      - daexim:
+          project: daexim
+      - integration-distribution:
+          project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
+      - lispflowmapping:
+          project: lispflowmapping
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d1a22125a4c421fa223b9a4d04457c72ea3999ec..566fd6d57a26347dfe7969a069df59bedca78dd4 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 - 20230301-160121.204"
+    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"

diff --git a/jjb/docs/docs-projects.yaml b/jjb/docs/docs-projects.yaml
index ad87d0bac9a6a756090b4821afcd8fff0aaa898e..f38b39d6b456cf90a3485165d654e8ae89b198ae 100644 (file)
--- a/jjb/docs/docs-projects.yaml
+++ b/jjb/docs/docs-projects.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: docs-update-{stream}
-    build-node: centos7-builder-2c-2g
+    build-node: centos8-builder-2c-2g
     jobs:
       - "docs-update-{stream}"
     stream:

diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml
index 85edb6d9f04184c99f1738c609fa133fb50ecf51..f137efede3f428fbf335827884571687610042be 100644 (file)
--- a/jjb/docs/docs-template.yaml
+++ b/jjb/docs/docs-template.yaml
@@ -13,7 +13,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-builder-2c-2g
+    node: "{build-node}"
     disabled: "{disable-job}"
 
     properties:

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 050810f235136f64554086dc16894bcbb636888a..d3478074c304b9141a76395315de5218c2370c6b 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 - 20230301-040106.351"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230401-040112.177"
 
     # 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 fa4e1c420f03a7e7ba3fd94fccb960ecede64bcd..d552e3e82701e4fffe6a47cd62d310c53f66f97c 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 - 20230301-040106.351"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230401-040112.177"
 
     # Features to install
     install-features: >