Feat: Branch cut stable/chlorine stream

Move master to the next release, 2023.03 Argon (Ar).

As this is a break-even point between Java 11 and Java 17 CSIT, make
sure we default to Java 17 and only override the default where
necessary.

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4458
Change-Id: Ia1163aac15cee36624d8f851ccad8a723548e2f8
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 70c29cbb222bb001e40690f1e757168badbd2824..04e9ba427a2a1ff79d9b651c2f727925def21a06 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -7,15 +7,17 @@
 
     # The project name
     project: "aaa"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "authn"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml
index 1daa333d12423f8a80ed50df2001a3b1a476a4c2..542148e5b9005dfacd162d19d5a7cc7414034a05 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:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
       - phosphorus:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index ce07be47c8fbfdd2bea3bddd0b07f56f5111d0e1..7a5e69fcb99cd07f756c9f917c76de422571cd06 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -50,8 +50,11 @@
       - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+          integration-test: argon
+      - chlorine:
+          branch: "stable/chlorine"
           integration-test: chlorine
 
     project: releng/autorelease

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 2a5dbdcd81d485303f0605b9769f782f22beaf86..b5386641a5188aa0ccb02f403927091d3a2bd1f0 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:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
       - phosphorus:

diff --git a/jjb/autorelease/view-autorelease-argon.yaml b/jjb/autorelease/view-autorelease-argon.yaml
new file mode 100644 (file)
index 0000000..440491c
--- /dev/null
+++ b/jjb/autorelease/view-autorelease-argon.yaml
@@ -0,0 +1,32 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_argon
+    name: releng-view-autorelease-argon
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
+
+- view:
+    name: Merge-Argon
+    description: "List of Argon Merge jobs for Autorelease"
+    job-name:
+      - "daexim-maven-merge-argon"
+      - "integration/distribution-maven-merge-argon"
+      - "jsonrpc-maven-merge-argon"
+      - "lispflowmapping-maven-merge-argon"
+      - "openflowplugin-maven-merge-argon"
+      - "ovsdb-maven-merge-argon"
+      - "serviceutils-maven-merge-argon"
+    <<: *releng_autorelease_view_common_argon

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index af00f82e92b7791ced7f4cff6e04453cff384f82..c01bb803955feb5f62766dc4c4200f1ce21f4c27 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "bgpcep"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 4a23d5babb7ac5ae7ad96aa8b97331d275c8e6d7..f4de205fc69592254f2bd751d31b9b5dab95d10a 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -7,15 +7,17 @@
 
     # The project name
     project: "bgpcep"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "bgp-ingest"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 eff8231c173199f616a98dac35c8e8ea45ef4870..54ae9d0b0ee86ec50e0848cfc1c536640728cc66 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "bgpcep"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "bgpclustering-ha"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 719979c7880fc95cac4ce19d834fe9fa2020e16e..99f2e9ff8e36fe4772844ffe0c2b352713c4de44 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "bgpcep"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "bgpclustering-longevity"
@@ -15,9 +16,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 16512d81a9adc956d86faadc2b6b97cbdb8e1c74..b07fe93a6ee54b5dd7b97abafea71746c6689aaf 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "bgpcep"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "bgpclustering"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 26568d90fd40ad40bcce43b6cce25615753b6d2b..60e34f63489c017196e3e2757087e15704982bda 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "bgpcep"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 4e29bc2ac36a188ea6d24ab516d2a0badda0a6a4..9d7ba8d5fd41308c13bda53783401aa5d9ab2c5d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "bgpcep"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 1a20ad613800eab0595599224c85444bc3879a37..7428dbd94a7e5f4800884e5f904d5237c62fa569 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -6,14 +6,16 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "akka1"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 9c33d26eb567a8b5f45941d51156add2f8ab44a6..437ec6f53398d38e2c5b0d28ee8d84e0f706c33d 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -5,6 +5,7 @@
       - inttest-csit-3node
 
     project: "controller"
+    jre: "openjdk17"
     functionality:
       - "clustering-ask"
       - "clustering-tell"
@@ -12,9 +13,10 @@
     elasticsearch-attribute: "disabled"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 4e910f28fec965034548340f30499e017810a65e..7ca84904ff3741b2b9997d0871a52ff2b9a20c43 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "cs-chasing-leader-longevity"
@@ -15,9 +16,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 4ea409b4d3633174bcc02acd8a5761f40d37ac88..583e9d80ee83c0ead495018cc575ffca27265706 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "cs-partnheal-longevity"
@@ -15,9 +16,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 07b8c934410641e76b03277ed10b9d1fc559f538..692ac7140fcfd5e05a280532511108d64807eacd 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "ddb-expl-lead-movement-longevity"
@@ -15,9 +16,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 77a182aeddca9a90660344ce1bcbf25a5ff9521e..3add89a18cefd6378da53b139658ba171a4620c5 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "notifications-longevity"
@@ -15,9 +16,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 32398fbefe69b72893d7d4a02215fcd604012806..01c8cdbee31a17e0187ca2b0a9eb874d19b5ce4f 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "drb-partnheal-longevity"
@@ -15,9 +16,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 4d3c6250855b3631e1e7fd416eb33df7e8174e53..92c6760b1492ab422751e1b613eade7bf79ff479 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "drb-precedence-longevity"
@@ -15,9 +16,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 308997813415f7b84ab393a5236a91d9f33054ee..930a5740c3f2af80bd2efa7f62c734e0861b2883 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "benchmark"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 2d899382327490772ae4fcb36053776cfb269084..f0580134405d0e7c0ec90f067b7541833461c2c9 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "benchmark"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 424cbb746931ec6a4cff5fe068b9f859f55fbabc..2857f799795feb110ea114e9a90dc2b33484d51a 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "rest-cars-perf"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 85bb05b76886ca00d2e37462643b1256ee1b8789..c7d3436e30a4cfaf66c06408b0a68b5b447b49bb 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "controller"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 29fa4daa7e2baef3227ae2909766c87141bc9e2b..6edc22a3ac93f6ee4a19fa43e68eb54709d1a41c 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "daexim"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "basic"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 124f32057a21b9e9eeed2b365acfe2357736066d..fdd81bb1a9cb1dfbeef6e5aab8db8186c2bcaa2d 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "daexim"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "clustering-basic"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 3bcb29b004578195e33f8a4b9c2d2a89d6415bb9..9319983adbf318914fe20c91aa8799f0de243af4 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: daexim-argon
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    project: "daexim"
+    project-name: "daexim"
+    stream: argon
+    branch: "master"
+    java-version: "openjdk17"
+    mvn-settings: "daexim-settings"
+    build-node: centos8-builder-4c-4g
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
+
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
 - project:
     name: daexim-chlorine
     jobs:
@@ -14,7 +39,7 @@
     project: "daexim"
     project-name: "daexim"
     stream: chlorine
-    branch: "master"
+    branch: "stable/chlorine"
     java-version: "openjdk17"
     mvn-settings: "daexim-settings"
     build-node: centos8-builder-4c-4g

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 9f0090cb17d5f68e97d963c543aa9d9b1b821d96..a434bac719af59fae83cd1dd4dbae845c3ee4f34 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -304,3 +304,34 @@
     csit-sanity-list-chlorine: >
       openflowplugin-csit-1node-sanity-only-chlorine,
       distribution-sanity-chlorine
+    csit-mri-list-argon: >
+      aaa-csit-1node-authn-all-argon,
+      controller-csit-1node-akka1-all-argon,
+      controller-csit-1node-benchmark-all-argon,
+      controller-csit-1node-rest-cars-perf-all-argon,
+      controller-csit-3node-benchmark-all-argon,
+      controller-csit-3node-clustering-ask-all-argon,
+      controller-csit-3node-clustering-tell-all-argon,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-argon,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-argon,
+      mdsal-csit-3node-netty-replicate-only-argon,
+      netconf-csit-1node-callhome-only-master,
+      netconf-csit-1node-scale-max-devices-only-master,
+      netconf-csit-1node-scale-only-master,
+      netconf-csit-1node-userfeatures-all-master,
+      netconf-csit-1node-userfeatures-rfc8040-all-master,
+      netconf-csit-3node-clustering-only-master,
+      netconf-csit-3node-clustering-scale-only-master,
+      yangtools-csit-1node-system-only-master
+    csit-weekly-list-argon: >
+      controller-csit-1node-notifications-longevity-only-argon,
+      controller-csit-3node-drb-partnheal-longevity-only-argon,
+      controller-csit-3node-drb-precedence-longevity-only-argon,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-argon,
+      bgpcep-csit-3node-bgpclustering-longevity-only-argon,
+      distribution-deploy-argon,
+      distribution-offline-argon,
+      openflowplugin-csit-1node-longevity-only-argon
+    csit-sanity-list-argon: >
+      openflowplugin-csit-1node-sanity-only-argon,
+      distribution-sanity-argon

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 03860324309ae9b22cea1f87bbf10f424327ace7..edffa352b8c620ffac22d746b4303ece6c5feea4 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -6,8 +6,10 @@
       - gerrit-tox-verify
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
       - phosphorus:

diff --git a/jjb/integration/csit-jobs-argon.lst b/jjb/integration/csit-jobs-argon.lst
new file mode 100644 (file)
index 0000000..ad94931
--- /dev/null
+++ b/jjb/integration/csit-jobs-argon.lst
@@ -0,0 +1,20 @@
+bgpcep-csit-1node-bgp-ingest-all-argon,
+bgpcep-csit-1node-bgp-ingest-mixed-all-argon,
+bgpcep-csit-1node-throughpcep-all-argon,
+bgpcep-csit-1node-userfeatures-all-argon,
+daexim-csit-1node-basic-only-argon,
+daexim-csit-3node-clustering-basic-only-argon,
+distribution-csit-managed-argon,
+jsonrpc-csit-1node-basic-only-argon,
+openflowplugin-csit-1node-cbench-only-argon,
+openflowplugin-csit-1node-flow-services-all-argon,
+openflowplugin-csit-1node-perf-bulkomatic-only-argon,
+openflowplugin-csit-1node-perf-stats-collection-only-argon,
+openflowplugin-csit-1node-scale-link-only-argon,
+openflowplugin-csit-1node-scale-only-argon,
+openflowplugin-csit-1node-scale-switch-only-argon,
+openflowplugin-csit-3node-clustering-bulkomatic-only-argon,
+openflowplugin-csit-3node-clustering-only-argon,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-argon,
+ovsdb-csit-1node-upstream-southbound-all-argon,
+ovsdb-csit-3node-upstream-clustering-only-argon,

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 39af018ca5b6806f48c934e1792bace26bffe4f2..a6d755ed6839a036734dd829e0383bcf8e3f6c65 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -26,10 +26,13 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
+          java-version: openjdk11
       - phosphorus:
           branch: "stable/phosphorus"
           mvn-version: mvn35
@@ -61,7 +64,7 @@
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           dependencies: >
             daexim-maven-merge-{stream},
@@ -70,6 +73,15 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
+      - chlorine:
+          branch: "stable/chlorine"
+          dependencies: >
+            daexim-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
@@ -115,10 +127,14 @@
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           dependencies: >
             distribution-merge-managed-{stream},
+      - chlorine:
+          branch: "stable/chlorine"
+          dependencies: >
+            distribution-merge-managed-{stream},
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
@@ -152,8 +168,10 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
@@ -211,8 +229,10 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
       - phosphorus:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 16d28d194168296a39eeb3ed9d9e8c86a97cd072..c29cb0380e03d84645fca110ce6b49ef661dab18 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -22,14 +22,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           csit-list: !include: csit-jobs-chlorine.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
             integration/distribution
-
+      - chlorine:
+          branch: "stable/chlorine"
+          csit-list: !include: csit-jobs-chlorine.lst
+          build-order: >
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
@@ -38,7 +44,6 @@
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
             integration/distribution
-
       - phosphorus:
           branch: "stable/phosphorus"
           mvn-version: "mvn35"
@@ -61,8 +66,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+          csit-blocklist: >
+            aaa controller dluxapps genius lispflowmapping l2switch mdsal
+            netconf netvirt odlmicro sxp yangtools
+            gate longevity sanity tdd tempest wip
+            bgpcep-csit-3node-bgpclustering-all
+            bgpcep-csit-3node-bgpclustering-ha-only
+            openflowplugin-csit-1node-bundle-based-reconciliation
+            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+          csit-list: !include: csit-jobs-argon.lst
+          csit-mri-list: "{csit-mri-list-argon}"
+          csit-weekly-list: "{csit-weekly-list-argon}"
+      - chlorine:
+          branch: "stable/chlorine"
           csit-blocklist: >
             aaa controller dluxapps genius lispflowmapping l2switch mdsal
             netconf netvirt odlmicro sxp yangtools
@@ -109,9 +127,13 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-argon}"
+      - chlorine:
+          branch: "stable/chlorine"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-chlorine}"
       - sulfur:
           branch: "stable/sulfur"

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index baf34e8f9962f8a1761063d9b72e72e135ee7746..58ef5fcf161e1005362018e091b97e2332a67838 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "jsonrpc"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "basic"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 64129a20906b2b7d9d94b0082fcef727f5e82168..eecfc0d9d47552ed9595da108f45bee50a30e17e 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: jsonrpc-argon
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: jsonrpc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
+          rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    project: "jsonrpc"
+    project-name: "jsonrpc"
+    stream: argon
+    java-version: "openjdk17"
+    branch: "master"
+    mvn-settings: "jsonrpc-settings"
+    build-node: centos8-builder-4c-4g
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
+
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-chlorine
     jobs:
@@ -15,7 +40,7 @@
     project-name: "jsonrpc"
     stream: chlorine
     java-version: "openjdk17"
-    branch: "master"
+    branch: "stable/chlorine"
     mvn-settings: "jsonrpc-settings"
     build-node: centos8-builder-4c-4g
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index dbd78d062301504259669af25e65407feca96fe9..4afe5b45b29d1df48ce37820094d9da8747f2e66 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -8,15 +8,17 @@
 
     # The project name
     project: "lispflowmapping"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "msmr"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 33385c4ba045a7055e3fd2786cdcfc48df8e8656..bb6b0fbfb20ec6cd92a0748c656797adf070ba4e 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,37 @@
 ---
+- project:
+    name: lispflowmapping-argon
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: lispflowmapping
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
+          rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    stream: argon
+    project: "lispflowmapping"
+    project-name: "lispflowmapping"
+    branch: "master"
+    java-version: "openjdk17"
+    mvn-settings: "lispflowmapping-settings"
+    mvn-goals: "clean deploy -DrepoBuild"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
+    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"
+    archive-artifacts: >
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+
+    build-node: centos8-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
 - project:
     name: lispflowmapping-chlorine
     jobs:
@@ -16,7 +49,7 @@
     stream: chlorine
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "master"
+    branch: "stable/chlorine"
     java-version: "openjdk17"
     mvn-settings: "lispflowmapping-settings"
     mvn-goals: "clean deploy -DrepoBuild"

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index fd78cf1ff5924608bf44b8e5873aa681b48f8edd..34d0428373b4c47c611aa43f1f36c8082ec46c13 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "mdsal"
+    jre: "openjdk17"
     disable-job: true
 
     # The functionality under test
     functionality: "bindingv1"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 4d3dcc69621e194e8306a28274fcea8be7b57f91..516ec6dfdf93041116d0ac9cdb74d2cc53dea1ae 100644 (file)
--- a/jjb/mdsal/mdsal-csit-netty-replication.yaml
+++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml
@@ -6,15 +6,22 @@
 
     # The project name
     project: "mdsal"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "netty-replicate"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+          install-features: >
+            features-controller,
+            odl-mdsal-replicate-netty,
+            odl-netconf-clustered-topology,
+            odl-clustering-test-app
+      - chlorine:
+          branch: "stable/chlorine"
           install-features: >
             features-controller,
             odl-mdsal-replicate-netty,

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 630054ab7523eca333e0feab0bdeab6b86031fc6..c94994473f5173301166b15d973a3fc642c50cb9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "cbench"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 8da6c926f25506593c2d04f4ff7a9af3bcfdce78..68e9d842d3eb4cd3866c57eead9c1cd00bb5b1e2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 bc886366b4300bd5975c1f08b967745d5c32dc17..2572e563585b47a2f11e4d74aed2ed77fcc8fbbd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 0476867ac0fa9b301ad6c77c7761fb7850dfcd47..ec2fa8697c43908c9aba7d0f88b17e2f724c2491 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 20f1a9ffd5a96350ef0fb2cd412e789260695de6..286ceee8870e34f8ed7566c84104914ed623850b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,11 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+          install: "all"
+      - chlorine:
+          branch: "stable/chlorine"
           install: "all"
       - sulfur:
           branch: "stable/sulfur"

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 292176a8dab98b6539371d87da56f73f8bafae6c..27c28e2a7d9ce32cd54d30770b649d81be3c186a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
     build-timeout: 1440
 
     # The functionality under test
@@ -16,9 +17,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 2febba92eadc67640a19a49c2114293dc8afb8b7..1908193520c819eff19be59f57feb5a60b0263c0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,11 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+          install: "all"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 48cdc518bf3176edac2f6bda633520d5f493747a..c09a5938fc58eef5ca010a5baa51dce64be4d58f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 00beb144ac19398c03aa3ae54262583a3814f91f..64a5f2e437eb03ec95e5afa88539afa4d253041a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -7,15 +7,17 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "sanity"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 1ef979e782c4033ea31ad6dab918c103c22adc0a..a24bae30ebaee33878a46a7eb7d3882df3353d6d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "scale-link"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - 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 24a99953c51d7efcad449f79af08e420900eb0ab..ba26e01622b25c8bf72ff6cfd46c3aed8c48d5e6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "scale-switch"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 7ae371f29aa68f74e57759c5bfc91e1a5b665271..5bffe82a779efa9e3e03ea77b365a3bb38d9c0d9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "openflowplugin"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index ffbb5b61f0f127c1ae312a6726a952da042bc483..fb0ac281ded7c8fd270432efcaf929d4f5578b1c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -6,17 +6,18 @@
 
     # The project name
     project: "openflowplugin"
+    java-version: "openjdk17"
+    mvn-version: "mvn38"
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          java-version: "openjdk17"
-          mvn-version: "mvn38"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
-          mvn-version: "mvn38"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 25825d077063ac48ded8f26ee88902451af00343..5f2f1e29bbe287f1a4a7aafef0aed86b86e60843 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,37 @@
 ---
+- project:
+    name: openflowplugin-argon
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    stream: argon
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "master"
+    build-node: centos8-builder-4c-4g
+    build-timeout: 90
+    java-version: "openjdk17"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    dependencies: >
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream}
+    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
 - project:
     name: openflowplugin-chlorine
     jobs:
@@ -17,7 +50,7 @@
     stream: chlorine
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "master"
+    branch: "stable/chlorine"
     build-node: centos8-builder-4c-4g
     build-timeout: 90
     java-version: "openjdk17"

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 33eb0d07b71601fded957ea1a4b0323e5807c00b..6bb490bac54352399f0369d2e91af260be579b52 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "ovsdb"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 96f57ca5e83fd123b64cfdba0beda7f0a72f04c0..162ea31b3f14c3f220cc46e68c80b28a4e35a58a 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: "ovsdb"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality:
@@ -14,9 +15,10 @@
 
     # Project branches
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index e61a2a1b2d893aadb51b8fd0bdb8b8c939a90894..bb1acbdb812eb8c89ae587f0597d1814b5ad229a 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -4,10 +4,13 @@
     jobs:
       - "ovsdb-daily-full-integration-{stream}"
 
+    java-version: "openjdk17"
+
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          java-version: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 17319de999f3b359a328db3a1ffbbe0cde9d9c43..780a1cf50412d745dffc23b8299d9066956a192d 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -6,16 +6,17 @@
 
     # The project name
     project: "ovsdb"
+    java-version: "openjdk17"
+    mvn-version: "mvn38"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          java-version: "openjdk17"
-          mvn-version: "mvn38"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
-          mvn-version: "mvn38"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 6d7a12d38d0fad8dc5d27b0f96cee57c8f9bc562..57c13671db11aaaaceda02331f1f8a1558b5b940 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: ovsdb-argon
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: ovsdb
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
+          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    stream: argon
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "master"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-settings: "ovsdb-settings"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
+
+    # Used by the release job
+    staging-profile-id: a68b188166958
+
 - project:
     name: ovsdb-chlorine
     jobs:
@@ -16,7 +43,7 @@
     stream: chlorine
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "master"
+    branch: "stable/chlorine"
     build-node: centos8-builder-4c-4g
     java-version: "openjdk17"
     mvn-settings: "ovsdb-settings"

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index 063f6392138b16bbff8ca4b18133863eefb73ad0..4e840d8cd6d79c0105e31660996b49e884e64cf3 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -5,16 +5,17 @@
       - inttest-patch-test
 
     project: "serviceutils"
+    java-version: "openjdk17"
+    mvn-version: "mvn38"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          java-version: "openjdk17"
-          mvn-version: "mvn38"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
-          mvn-version: "mvn38"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 7bba04192cd5cc7209a432c20272c3b8210e2ec2..f995f26e6fd215e556b73173f83707619351c141 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-chlorine
+    name: serviceutils-argon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
@@ -14,6 +14,38 @@
       - odl-maven-verify-jobs-jdk17
 
     branch: "master"
+    stream: argon
+
+    project: "serviceutils"
+    project-name: "serviceutils"
+    build-node: centos8-builder-2c-2g
+    java-version: "openjdk17"
+    mvn-settings: "serviceutils-settings"
+    build-timeout: 90
+    dependencies: >
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-chlorine
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: serviceutils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
+          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    branch: "stable/chlorine"
     stream: chlorine
 
     project: "serviceutils"

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 6fd6f54ba734e0fc85d90b87dc72e21f6a0c855b..94f3906afd07c869f6acf2db141094896041bf50 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -6,15 +6,17 @@
 
     # The project name
     project: "yangtools"
+    jre: "openjdk17"
 
     # The functionality under test
     functionality: "system"
 
     # Project branches.
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          jre: "openjdk17"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           jre: "openjdk11"