Merge changes from topic "bashisms"

* changes:
  Chore: migrate some scripts shebang to sh
  Fix: sourced files w/o arg bashisms

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 864d346fd34447a3aeacbe1270c3f0422c14b706..5fe252337464f1b501b85f537ac3e0ddae734fef 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -17,6 +17,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 * ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
 * ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
+* ZZCI - CentOS 7 - builder - x86_64 - 20220811-110452.412
 * ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896
@@ -38,6 +39,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20210608-222908.760
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20211001-000220.740
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20220401-000109.037
+* ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20220811-110620.848
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200101-010206.159
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200501-010133.750
@@ -47,6 +49,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20210401-010130.589
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20211001-010151.446
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20220401-010109.230
+* ZZCI - CentOS 7 - devstack-stein - x86_64 - 20220811-110634.575
 * ZZCI - CentOS 7 - docker - x86_64 - 20190924-232930.807
 * ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 * ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
@@ -55,8 +58,10 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955
 * ZZCI - CentOS 7 - docker - x86_64 - 20211006-065328.122
 * ZZCI - CentOS 7 - docker - x86_64 - 20220401-220102.840
+* ZZCI - CentOS 7 - docker - x86_64 - 20220811-110637.413
 * ZZCI - CentOS 7 - helm - x86_64 - 20211217-010326.708
 * ZZCI - CentOS 7 - helm - x86_64 - 20220401-000138.473
+* ZZCI - CentOS 7 - helm - x86_64 - 20220811-110654.568
 * ZZCI - CentOS 7 - robot - 20190430-080312.962
 * ZZCI - CentOS 7 - robot - x86_64 - 20191002-145719.577
 * ZZCI - CentOS 7 - robot - x86_64 - 20200812-002103.678
@@ -75,6 +80,8 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220629-035812.822
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220701-160059.919
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220801-160143.906
+* ZZCI - CentOS Stream 8 - builder - x86_64 - 20220811-073719.385
+* ZZCI - CentOS Stream 8 - robot - x86_64 - 20220811-231817.668
 * ZZCI - OPNFV - apex - compute - 0
 * ZZCI - OPNFV - apex - compute - 1
 * ZZCI - OPNFV - apex - controller - 0
@@ -113,6 +120,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 18.04 - helm - x86_64 - 20211116-033750.677
 * ZZCI - Ubuntu 18.04 - helm - x86_64 - 20211215-222010.564
 * ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220501-140101.102
+* ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220811-112321.717
 * ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200121-232651.765
 * ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200521-041758.169
 * ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200811-124252.042

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg
new file mode 100644 (file)
index 0000000..3c48990
--- /dev/null
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg
@@ -0,0 +1,4 @@
+LABELS=centos8-robot-2c-8g
+IMAGE_NAME=ZZCI - CentOS Stream 8 - robot - x86_64 - 20220811-231817.668
+HARDWARE_ID=v3-standard-2
+INSTANCE_CAP=16

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index b4c289f728afbe33d2bbe66518f23f804b196090..70c29cbb222bb001e40690f1e757168badbd2824 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -15,7 +15,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 1cfa4881640a6f5c7392615e34d11ba0c88bc01f..af00f82e92b7791ced7f4cff6e04453cff384f82 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index c04a885064007ffee967f4021f3f50196062204d..4a23d5babb7ac5ae7ad96aa8b97331d275c8e6d7 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -15,7 +15,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index e8b5aa915e3eeb89f4fe1312d8b0590db9b9bc25..eff8231c173199f616a98dac35c8e8ea45ef4870 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index af02fab205d35c6174464c0fc2d6b01c034ca9cc..719979c7880fc95cac4ce19d834fe9fa2020e16e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -17,7 +17,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 9fe5367055c1f1241ae5adc277b384255fed53bb..16512d81a9adc956d86faadc2b6b97cbdb8e1c74 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index d886bb9de34968e1347a7aa90c54cba9a28ea466..26568d90fd40ad40bcce43b6cce25615753b6d2b 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 5f527c601c6afe93692784c570137dfeb7300237..4e29bc2ac36a188ea6d24ab516d2a0badda0a6a4 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index b8d2090191971c65cc621d4adfb50456ec3fdd80..1a20ad613800eab0595599224c85444bc3879a37 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -13,7 +13,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 4a8004b2c41b6fd7b21625d30c7a4114ebf5b75a..9c33d26eb567a8b5f45941d51156add2f8ab44a6 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 044500ff133a416c18ca07436aab81c295641808..4e910f28fec965034548340f30499e017810a65e 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -17,7 +17,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 91f89ef03e380a19dd5cd518e7bb0864f031c971..4ea409b4d3633174bcc02acd8a5761f40d37ac88 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -17,7 +17,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index f16187477960c63039fa936c832b6d3f0b78fc2f..07b8c934410641e76b03277ed10b9d1fc559f538 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -17,7 +17,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 4c24fc9792947f6107e23078ef66aab5abbfe0f5..77a182aeddca9a90660344ce1bcbf25a5ff9521e 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -17,7 +17,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 4c8c6386f6c48a78c2561f999bd0928ceb71b71f..32398fbefe69b72893d7d4a02215fcd604012806 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -17,7 +17,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 41148d3d36107847d30dcd91e8b30ac4f9d46ef4..4d3c6250855b3631e1e7fd416eb33df7e8174e53 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -17,7 +17,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 4b29eff720ebb5756afd2356533b02aa70cd3d92..308997813415f7b84ab393a5236a91d9f33054ee 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 9ff94cc4cfdfa01fe9d5230fafac2c7835f2b61d..2d899382327490772ae4fcb36053776cfb269084 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 5ea8e953701db9eb84bfb0e4d6ec578bc321dd59..424cbb746931ec6a4cff5fe068b9f859f55fbabc 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index eec65ba65e235a7db020416012f6c929369bbea8..85bb05b76886ca00d2e37462643b1256ee1b8789 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 318fd12c19069e34ed087b2b4bafed37c235b9bc..29fa4daa7e2baef3227ae2909766c87141bc9e2b 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index c5458e0348cacafb33f261a12427b7a030c5035f..124f32057a21b9e9eeed2b365acfe2357736066d 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 9f9d3f4e70abb0de4b72d4fba5318d0f3206332a..faff0782452b7a6c69ddfe53259eac012f79da19 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 - 20220811-110452.412"
+    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20220811-073719.385"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
@@ -112,7 +112,7 @@
     tools_system_count: 1
     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_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20220811-110634.575"
     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"
 

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 4b8628d5ea4e479685a830b92a603d71ce7a7703..61c6e7075b85f61e58ee43e70a580cf22a024834 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/integration/integration-compare-distributions.sh b/jjb/integration/integration-compare-distributions.sh
index 9dfede50fd0e4880ff448401c642e0fcd5f0bca1..dc694a1eb677bdcc73c4472adc35d6c90a50c961 100644 (file)
--- a/jjb/integration/integration-compare-distributions.sh
+++ b/jjb/integration/integration-compare-distributions.sh
@@ -26,7 +26,9 @@ else
 fi
 
 # Extract the BUNDLE_VERSION from the pom.xml
-BUNDLE_VERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
+# TODO: remove the second xpath command once the old version in CentOS 7 is not used any more
+BUNDLE_VERSION=$(xpath -e '/project/version/text()' pom.xml 2>/dev/null ||
+    xpath pom.xml '/project/version/text()' 2>/dev/null)
 echo "Bundle version is ${BUNDLE_VERSION}"
 # Acquire the timestamp information from maven-metadata.xml
 NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/${KARAF_PROJECT}/${KARAF_ARTIFACT}"
@@ -39,7 +41,9 @@ if [ $? -ne 0 ]; then
 fi
 
 less maven-metadata.xml
-TIMESTAMP=$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)
+# TODO: remove the second xpath command once the old version in CentOS 7 is not used any more
+TIMESTAMP=$(xpath -e "//snapshotVersion[extension='zip'][1]/value/text()" maven-metadata.xml 2>/dev/null ||
+    xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)
 echo "Nexus timestamp is ${TIMESTAMP}"
 BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
 BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
@@ -80,4 +84,3 @@ if [ -f /tmp/distro_new/bin/extract_modules.sh ]; then
     /tmp/distro_new/bin/check_modules.sh
     mv /tmp/distro_new/opendaylight-models "$WORKSPACE"/archives
 fi
-

diff --git a/jjb/integration/integration-detect-variables.sh b/jjb/integration/integration-detect-variables.sh
index baaf7183dd8cf698cbf0696eec7ca36cc1a32574..925192c07ec5e32cf83c76b46e8ef6515e1ef4f5 100644 (file)
--- a/jjb/integration/integration-detect-variables.sh
+++ b/jjb/integration/integration-detect-variables.sh
@@ -21,13 +21,17 @@ if [ "${BUNDLE_URL}" == 'last' ]; then
         wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
     fi
     # Extract the BUNDLE_VERSION from the pom.xml
-    BUNDLE_VERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)"
+    # TODO: remove the second xpath command once the old version in CentOS 7 is not used any more
+    BUNDLE_VERSION=$(xpath -e '/project/version/text()' pom.xml 2>/dev/null ||
+        xpath pom.xml '/project/version/text()' 2>/dev/null)
     echo "Bundle version is ${BUNDLE_VERSION}"
     # Acquire the timestamp information from maven-metadata.xml
     NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/${KARAF_PROJECT}/${KARAF_ARTIFACT}"
     wget "${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml"
     less "maven-metadata.xml"
-    TIMESTAMP="$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)"
+    # TODO: remove the second xpath command once the old version in CentOS 7 is not used any more
+    TIMESTAMP=$(xpath -e "//snapshotVersion[extension='zip'][1]/value/text()" maven-metadata.xml 2>/dev/null ||
+        xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)
     echo "Nexus timestamp is ${TIMESTAMP}"
     BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 6e13844bcd0a7d705f5da95dc0c63122f980550d..155ed9c9393346635a996c276eb4bf47437c501d 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -47,7 +47,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: centos8-robot-2c-8g
     concurrent: true
     disabled: "{disable-job}"
 

diff --git a/jjb/integration/integration-upload-distribution.sh b/jjb/integration/integration-upload-distribution.sh
index 07bba5e61308dda7d9b44aa06dceea089cfbb3dd..7b09aa1f32607eaa0a09664bdea319f9594b80ec 100644 (file)
--- a/jjb/integration/integration-upload-distribution.sh
+++ b/jjb/integration/integration-upload-distribution.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -xeu -o pipefail
 
-BUNDLE_VERSION=$(xpath "${BUNDLE_POM}" '/project/version/text()' 2> /dev/null)
+# TODO: remove the second xpath command once the old version in CentOS 7 is not used any more
+BUNDLE_VERSION=$(xpath -e '/project/version/text()' "${BUNDLE_POM}" 2>/dev/null ||
+        xpath "${BUNDLE_POM}" '/project/version/text()' 2>/dev/null)
 BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
 BUNDLE="${BUNDLEFOLDER}.zip"
 BUNDLE_PATH="/tmp/r/org/opendaylight/${KARAF_PROJECT}/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}"

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index 01ecb715a1662854b3dfea9b9e742b49c2512df8..baf34e8f9962f8a1761063d9b72e72e135ee7746 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 4348b0ac560b1887a829b0f4489a4622a0368cf0..5c6ac54a5981f074014b0780eb9864a68f13811d 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -15,7 +15,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 798a2a85029e1fa6ce6da3acbd60372e6eef2510..5fd05aae8d9c7310710a9b844fc321d18db4da96 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -15,7 +15,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 5cd7cab1f1fb357108b7255b40a31d2e7ae42b0e..7456efb43d4c1c97d14e45332801dd0c3965dc8c 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 4c3f2ecb587bc4a898a104e4ae141bedf981970c..dbd78d062301504259669af25e65407feca96fe9 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 425bf57c146c74b8580a3ab21215139d75ee5d21..fd78cf1ff5924608bf44b8e5873aa681b48f8edd 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
index fedca236f493d37147d197bceb04299be6d732e1..4d3dcc69621e194e8306a28274fcea8be7b57f91 100644 (file)
--- a/jjb/mdsal/mdsal-csit-netty-replication.yaml
+++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
           install-features: >
             features-controller,
             odl-mdsal-replicate-netty,

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 5e8a359d2dba2b676d3057370fcb491faf17adbc..027990350d5aef3191aba32b7c616789c43065e5 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -14,7 +14,7 @@
     stream:
       - master:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index cb0edd4b43d890b15d38e4e5dc7eac3ab09f3a9d..13c17b5bc8bf097441227f3d7f61f7966b1cd110 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -14,7 +14,7 @@
     stream:
       - master:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index a12f3132b757a7e83ffabe1e9843943615392db4..d60b41c51197a00b34bac12f6bc3dde309f1cadb 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -16,7 +16,7 @@
     stream:
       - master:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-distribution-mri-test.yaml b/jjb/netconf/netconf-distribution-mri-test.yaml
index 184782d48b69257d14abba997631b5daaf2fd431..402e53cae3a7db7e8d4c1bb545d6e5c06028d25e 100644 (file)
--- a/jjb/netconf/netconf-distribution-mri-test.yaml
+++ b/jjb/netconf/netconf-distribution-mri-test.yaml
@@ -9,7 +9,7 @@
     stream:
       - master:
           branch: "master"
-          java-version: "openjdk11"
+          java-version: "openjdk17"
 
     os-branch: "queens"
 

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 15d861ced5f6798f1577ef8fec2fe94c46dd7c74..2a211709db2107e7b315adee52d8c56d41c4692c 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -14,7 +14,7 @@
     stream:
       - master:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
 
     karaf-version: netconf
 
@@ -50,7 +50,7 @@
     stream:
       - master:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index b3a60ac3ff1ba55346acf934ddfb69685345b823..142d0acd19b7e6d64c95d47a523899a103c6b3cb 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -20,7 +20,7 @@
     stream:
       - master:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
 
     karaf-version: netconf
 

diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml
index ea1ed1ca1384d11874619baf0bf20e9b8b139df7..50927adec88947bdf1ff7024575758bdb651f90b 100644 (file)
--- a/jjb/odlmicro/odlmicro-csit.yaml
+++ b/jjb/odlmicro/odlmicro-csit.yaml
@@ -15,7 +15,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
           functionality: "netconf"
           robot-options: >
             -e ODLMICRO_IGN
@@ -61,7 +61,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
           functionality: "netconf-devices-scale"
           robot-options: >
             -e ODLMICRO_IGN
@@ -127,7 +127,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
           functionality: "netconf-general-scale"
           robot-options: >
             -e ODLMICRO_IGN

diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml
index 48090e8233f3957b45d4506daed899f0e07b11db..dfb50e6dce3d03d6cd907062c9a2ecbad425f8ab 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -12,7 +12,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 59ef495846514041919096ef6fd6fdb77d64d4ec..630054ab7523eca333e0feab0bdeab6b86031fc6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 6b0223f6696f9047f0c2461a7718085f7e950575..8da6c926f25506593c2d04f4ff7a9af3bcfdce78 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index b5c808d9f90666e48aad637244fb669f9925aec4..bc886366b4300bd5975c1f08b967745d5c32dc17 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 4ffa70b14e4e7fc5df601a4b40c9a79cf2daea1d..0476867ac0fa9b301ad6c77c7761fb7850dfcd47 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 1f08793a9b32815b41b9a77ac4c58a52b0c0ea96..20f1a9ffd5a96350ef0fb2cd412e789260695de6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
           install: "all"
       - sulfur:
           branch: "stable/sulfur"

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 63578421c9197814eaf1601a78b98f91540d5613..292176a8dab98b6539371d87da56f73f8bafae6c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -18,7 +18,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 54a7e24b53d0f96fbd1f0e6580515868b1d8d7a7..2febba92eadc67640a19a49c2114293dc8afb8b7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 3ee8471d948581c286c60e242f3a69dec09476aa..48cdc518bf3176edac2f6bda633520d5f493747a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 407e44aec4403645f90953f155cad938011da62a..00beb144ac19398c03aa3ae54262583a3814f91f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -15,7 +15,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 2f44fe626bd543c55566f0831fc5786ae738cea9..1ef979e782c4033ea31ad6dab918c103c22adc0a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 2f5d49cced064ca34d6cb083e61db11dd0708c55..24a99953c51d7efcad449f79af08e420900eb0ab 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index aead9a5c423f94b4536bcd5bcdb780a02335f765..7ae371f29aa68f74e57759c5bfc91e1a5b665271 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 09f93f246b3250e75f50eb9257134d9ae1cfccd3..ffbb5b61f0f127c1ae312a6726a952da042bc483 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -11,7 +11,7 @@
     stream:
       - chlorine:
           branch: "master"
-          java-version: "openjdk11"
+          java-version: "openjdk17"
           mvn-version: "mvn38"
       - sulfur:
           branch: "stable/sulfur"

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 2dc384c3120956ad3f0b0f4fcc11db78f8b19cb9..33eb0d07b71601fded957ea1a4b0323e5807c00b 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 14102449fdddc4e9f9546e3a19b8baaf3180d01d..96f57ca5e83fd123b64cfdba0beda7f0a72f04c0 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -16,7 +16,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index d525cf45bb9a3816763da56e6f101ac8e9111f31..e61a2a1b2d893aadb51b8fd0bdb8b8c939a90894 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -7,7 +7,7 @@
     stream:
       - chlorine:
           branch: "master"
-          java-version: "openjdk11"
+          java-version: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index fa59baa411cc1e6da822fbad111feb5776bb91c4..17319de999f3b359a328db3a1ffbbe0cde9d9c43 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -10,7 +10,7 @@
     stream:
       - chlorine:
           branch: "master"
-          java-version: "openjdk11"
+          java-version: "openjdk17"
           mvn-version: "mvn38"
       - sulfur:
           branch: "stable/sulfur"

diff --git a/jjb/releng-maven-mri-stage.sh b/jjb/releng-maven-mri-stage.sh
index e056a8bbee18e63b33a2f1b7e197e157f5fedaf3..3b5ddd56d08ae141bf90e65e08b8d24e4919e28a 100644 (file)
--- a/jjb/releng-maven-mri-stage.sh
+++ b/jjb/releng-maven-mri-stage.sh
@@ -18,7 +18,9 @@ staging_repo=$(sed -n -e 's/Staging repository \(.*\) created\./\1/p' "$TMP_FILE
 mkdir -p "$WORKSPACE/archives"
 echo "$staging_repo ${NEXUS_URL}/content/repositories/$staging_repo" | tee -a "$WORKSPACE/archives/staging-repo.txt"
 
-staged_version=$(find . -name '*karaf*.pom' -exec xpath {} '/project/version/text()' \; 2> /dev/null)
+# TODO: remove the second xpath command once the old version in CentOS 7 is not used any more
+staged_version=$(find . -name '*karaf*.pom' -exec \
+    sh -c 'xpath -e "/project/version/text()" "$1" 2>/dev/null || xpath "$1" "/project/version/text()" 2>/dev/null' xpath.sh {} \;)
 BUNDLE_URL="${NEXUS_URL}/content/repositories/$staging_repo/org/opendaylight/${PROJECT}/${KARAF_ARTIFACT}/${staged_version}/${KARAF_ARTIFACT}-${staged_version}.zip"
 
 # Cleanup

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index 1d1977e9bd86734d3542ead109d070bdb42610e3..063f6392138b16bbff8ca4b18133863eefb73ad0 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -9,12 +9,15 @@
     stream:
       - chlorine:
           branch: "master"
+          java-version: "openjdk17"
           mvn-version: "mvn38"
       - sulfur:
           branch: "stable/sulfur"
+          java-version: "openjdk11"
           mvn-version: "mvn38"
       - phosphorus:
           branch: "stable/phosphorus"
+          java-version: "openjdk11"
           mvn-version: "mvn35"
 
     os-branch: "queens"

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 7b3e3140d60b0fc46617009ca5a4324f36f76a0f..6fd6f54ba734e0fc85d90b87dc72e21f6a0c855b 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -14,7 +14,7 @@
     stream:
       - chlorine:
           branch: "master"
-          jre: "openjdk11"
+          jre: "openjdk17"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 3e7747f4ba8cb4d902e44fb2cdb445e2b5d1e528..6482d9b4f870be5998b10805614ff86c2545b2b0 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -61,7 +61,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
       - odl-maven-verify-jobs-jdk17:
-        build-node: centos8-builder-4c-4g
+          build-node: centos8-builder-4c-4g
 
     project: yangtools
     project-name: yangtools