Chore: Remove stable/argon jobs

Remove "stable/argon" from the Jenkins infra since Calcuium is released
and Scandium is moved to the master. All jobs with stable/argon branch
is marked EOL and no longer required.

Change-Id: Ia74536fefdf18cf9c0e3fb721a7f740ebe421afc
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index cf860ee0d095038457fb037e386e19b0e016d519..b2029a98e2181b2e514ba3c69af16b46bac737fd 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -20,8 +20,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml
index fca05110e1b8bb26c364c5fa9b9e75c5bf76a0e6..df19755bf5e16a2d275bdbcf45c9158dc47bd1d7 100644 (file)
--- a/jjb/autorelease/autorelease-branch-lock.yaml
+++ b/jjb/autorelease/autorelease-branch-lock.yaml
@@ -38,7 +38,7 @@
           default: ""
           description: |
             Gerrit parameter to identify a new Gerrit branch for branch cutting.
-            ex: stable/potassium, stable/argon
+            ex: stable/potassium, stable/calcium
       - bool:
           name: DRY_RUN
           default: true
@@ -94,5 +94,3 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"

diff --git a/jjb/autorelease/autorelease-gerrit-branch-lock.sh b/jjb/autorelease/autorelease-gerrit-branch-lock.sh
index 2ab485e2556b4bd5d77185d9426c3a68ee22361b..e3d5d94a256f0107b01d84472d8180b908fe403e 100644 (file)
--- a/jjb/autorelease/autorelease-gerrit-branch-lock.sh
+++ b/jjb/autorelease/autorelease-gerrit-branch-lock.sh
@@ -66,7 +66,7 @@ case $mode in
             git commit -asm "Chore: Lock for new branch cutting: ${GERRIT_BRANCH_NEXT}"
         else
             echo "ERROR: Cannot perform branch cutting on non-master branch."
-            echo "ERROR: stable branch should be ex: stable/argon"
+            echo "ERROR: stable branch should be ex: stable/calcium"
             exit 1
         fi
         ;;

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 85935b18f1ff4d63fb74e891069305bbb81ab23b..0be2b31d244336501db3c75afd72a8ec2b6df7da 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -15,8 +15,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     project: releng/autorelease
     project-name: autorelease
@@ -44,9 +42,6 @@
       - potassium:
           branch: "stable/potassium"
           integration-test: potassium
-      - argon:
-          branch: "stable/argon"
-          integration-test: argon
 
     project: releng/autorelease
     project-name: autorelease

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 411fd0402e9b8f99211cd59c9c8dd0fccf4c0e17..3d451a3362cb47bf1a2e7bc2f75a8e669f98a1d9 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -457,7 +457,7 @@
           name: RELEASE
           description: |
             Release to generate release notes for.
-            Eg. Potassium-SR1, Argon-SR1 ...
+            Eg. Potassium-SR1, Calcium-SR1 ...
     scm:
       - lf-infra-gerrit-scm:
           git-url: "$GIT_URL/$GERRIT_PROJECT"

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index f87225c2a5923509e6e1240e5589a7290b920ac9..35afd7ae340a8a00be2b5a963ba4bdbd14d14bbf 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -17,5 +17,3 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"

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

diff --git a/jjb/autorelease/view-autorelease-argon.yaml b/jjb/autorelease/view-autorelease-argon.yaml
deleted file mode 100644 (file)
index 747559a..0000000
--- a/jjb/autorelease/view-autorelease-argon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# 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 caf633500e7b4f1a0eec52a8ce3d894ca2c72e06..c2ab3c5eaa900a4dc3f61381959581a1b6645a3c 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 4b731bdcdf5dcba22dfba948162284c6be19bd16..05a71472f9500903dc6775c2dfa76b9a46fb3622 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -20,8 +20,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 858d6d08ad0c3e5b2f0213e4fd61ee06f1443a90..66799723928355166cb8d1d85ff04f28b8b89a8a 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index b0fe8ee97ad9fa194606cba6a4f327dde5f63504..96a5538630698dceac0e6c666ef7403251bd4a26 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -22,8 +22,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 6fccacaf88c1abe8fde445caeb706f58c6c66cde..ca43b4369cd6080c7cd83351433405097750f8ad 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 30e17aa24cc8c7ef785d901097af4e4f9d224d67..d40db5166c2203e8b6bf45462efc90b51831a50e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 2f527a63a0ff190117b0bc4bda972ce7053d0aea..494f81885d478517d35f8d28a3a58ec7d748969c 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     karaf-version: bgpcep
 

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 78c2ece9b134c2c0d3190d9fb50221341354c8b4..09547813acdca7f064e7f2b2daa95203117c5dac 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -18,8 +18,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 3328d4c21d14f755cf2a62625e60d9ea0d3463d2..5b778a54d9017b447122b73ee8e8ba3d90ade4e3 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index c673ff87eae46fe494d590e1296833f632270d61..f1eb5abce8a9e47d3e714be19f0e11b8d8348189 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -22,8 +22,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 25e1a3adfd2555ee82d7f937911b0d1ba13d526b..f946a66c53921b4a631b19688b2088854354b43f 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -22,8 +22,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index 241ec4554a2bae5b394f4aec859671dacc821f81..b1ff2f623c2b97309fe0822a2c902e19bdaece2e 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -22,8 +22,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 25a03e8dbecb1de9e7d3844486527bab50907bb7..938b718b3db677adbb2908cdc23cbe2d73d781cd 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -22,8 +22,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 0177e7d0fdd0bab8d49f191ce0b3035cb52d1ef0..6afe53fb2bad699771047934c530a5456866f814 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -22,8 +22,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 98c560460ba5c8d6f35a2244ce6fd6fdfb581b9e..941a9961160b14854358ab03094cf400f1272f37 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -22,8 +22,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 64248d04367259403c7d124f45bad257928b21df..4fccc963a43ce089b2bd478bec5c524eb7cb1340 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index f4ccc061b20a33e6cd3badd37d1b0d79badedcd6..337fef730102df414d9c4f4ad45fbaa1faa788ef 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index b7528c1e9332d820431c22d87f289aaeabe0d9d1..c5a727a4da706a9eaa01c80c37f21d4e1da38355 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index 9c7ee3acae2c70a1462e0e6b6fe4c61503dbf5c4..14ee52d0e8009771ddedc6864aac0f791b277a8b 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 3059b71c8809909acdb01a764f160693c6031ab1..4d8c082f3e9ebd6f163799fa9d7beec66401daaf 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index 6188e35db5e720ac27fa078f2965fbc186587d9b..14836acca5236095ae6eb9a351417e3c4f6b647e 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 92d3a94b52cc1fe4540d8c0b1d8e038b3df40a61..60210c3403658cd6dff23db957171d6c75fcdd1c 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -68,29 +68,6 @@
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-argon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos8-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: "stable/argon"
-    mvn-settings: "daexim-settings"
-    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-sonar
     jobs:

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 045baf77b008254c2bb679572c2cfe7316de1917..c6f830f8e50e7fe3b411a60872c1be46e6c0de8c 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -127,9 +127,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/argon
+    verify-branch: stable/potassium
     # Value for ODL_STREAM
-    verify-stream: argon
+    verify-stream: potassium
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk17
 
@@ -214,35 +214,6 @@
     10-inclusion-flag: "off"
     10-exclude-value: ""
 
-    # Manual CSIT job lists used by sanity or periodic in nature.
-    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-3node-clustering-only-master,
-      netconf-csit-3node-clustering-scale-only-master,
-      yangtools-csit-1node-system-only-argon
-    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,
-      openflowplugin-csit-1node-longevity-only-argon
-    csit-sanity-list-argon: >
-      openflowplugin-csit-1node-sanity-only-argon,
-      distribution-sanity-argon
     csit-mri-list-potassium: >
       aaa-csit-1node-authn-all-potassium,
       controller-csit-1node-akka1-all-potassium,

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 18ec7dbc8fe3229ca7f31d2cb01257a7737d8a19..8f6bd56c74e7cf331ad87e5cb44e550e5f03cb03 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -12,8 +12,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     project: docs
     project-name: docs

diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml
index 52759673553a82f58f74f5063499aba2f96ca1b2..f8981036c40a2b98f1447658811c6b34faff572f 100644 (file)
--- a/jjb/docs/docs-template.yaml
+++ b/jjb/docs/docs-template.yaml
@@ -29,7 +29,7 @@
           lftools-version: "{lftools-version}"
       - string:
           name: RELEASE_NAME
-          description: "The next release name eg: Argon, Potassium."
+          description: "The next release name eg: Calcium, Potassium."
       - bool:
           name: PUBLISH
           default: false

diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh
index 7e4c5b988d7f9e95a250ea36c0d685f12ccf2bd3..ac10417252a3ca70b116fa81bd133990c06a90e6 100644 (file)
--- a/jjb/docs/docs_version_bump.sh
+++ b/jjb/docs/docs_version_bump.sh
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <RELEASE_NAME> <PUBLISH>"
     echo ""
-    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Argon, Potassium."
+    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Calcium, Potassium."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }

diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh
index 45c6f2850580556286e8710e1ca9dabe43e76d89..5b1c17f909d7af2fbdc31b1c01f6d30f050cae65 100644 (file)
--- a/jjb/docs/docs_version_bump_projects.sh
+++ b/jjb/docs/docs_version_bump_projects.sh
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <release_name> <PUBLISH>"
     echo ""
-    echo "    release_name:  The release_name e.g Argon, Potassium."
+    echo "    release_name:  The release_name e.g Calcium, Potassium."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }

diff --git a/jjb/integration/csit-jobs-argon.lst b/jjb/integration/csit-jobs-argon.lst
deleted file mode 100644 (file)
index ad94931..0000000
--- a/jjb/integration/csit-jobs-argon.lst
+++ /dev/null
@@ -1,20 +0,0 @@
-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 dcba0ef5427e008617bad04c2e55a26305a70c8b..4a0565be222c46e42636610d3e2664858ac60f5d 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -24,12 +24,12 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - calcium:
+      - scandium:
           branch: "master"
+      - calcium:
+          branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
 - project:
     name: distribution-managed
@@ -53,35 +53,21 @@
     jre: "openjdk17"
     karaf-version: karaf4
     dist-pom: "distribution/pom.xml"
+    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},
 
     stream:
-      - calcium:
+      - scandium:
           branch: "master"
-          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},
+      - calcium:
+          branch: "stable/master"
       - potassium:
           branch: "stable/potassium"
-          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},
-      - argon:
-          branch: "stable/argon"
-          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},
 
 - project:
     name: distribution-sonar
@@ -113,12 +99,12 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     stream:
-      - calcium:
+      - scandium:
           branch: "master"
+      - calcium:
+          branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
 - project:
     name: distribution-docker-release

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 9c395414e5b418081cb635e1f218431d0c7576d5..3ac00be7f4e697e29f8cd51863aba2518b66b3ab 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -42,13 +42,6 @@
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
             integration/distribution
-      - argon:
-          branch: "stable/argon"
-          csit-list: !include: csit-jobs-argon.lst
-          build-order: >
-            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
-            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
-            integration/distribution
 
 - project:
     name: integration-distribution
@@ -101,19 +94,6 @@
           csit-list: !include: csit-jobs-potassium.lst
           csit-mri-list: "{csit-mri-list-potassium}"
           csit-weekly-list: "{csit-weekly-list-potassium}"
-      - argon:
-          branch: "stable/argon"
-          csit-blocklist: >
-            aaa controller 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}"
 
 - project:
     name: integration-sanity
@@ -135,10 +115,6 @@
           branch: "stable/potassium"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-potassium}"
-      - argon:
-          branch: "stable/argon"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-argon}"
 
 - job-template:
     name: "integration-merge-dashboard"

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index 1b18f0010c2ab2917347fb12f39b2eacd2b44afe..1f8afc0830adf4b8d5da8758049a2739daa5501e 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 2f7431d59fc0407f5064dfc6bd74968d4afa566f..d8a80d67e3ce93b687099f81c840d3e1c7a69f53 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -68,29 +68,6 @@
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-argon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos8-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
-    branch: "stable/argon"
-    mvn-settings: "jsonrpc-settings"
-    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-release-management
     jobs:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index f91440b815219a14582b8b37946475d7b8e26c92..607518a43dca34270e78e80931a5229bd4c6513a 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 81d62521f9600a9c1e1c225fda6f954d24079ab4..46adbd8d2c4b862c085eaa9d2c5ef10063532536 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -98,39 +98,6 @@
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-argon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs":
-          mvn-version: mvn38
-          java-version: openjdk17
-      - "{project-name}-rtd-jobs":
-          build-node: centos8-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: "stable/argon"
-    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-sonar
     jobs:

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 4cea6652cbcea7923c18e96221fbac1229a114d5..c571c7726c76d9bb596e34a7e9ef01986115f771 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
index 9cb6c101cab86e65edf99fba24ce510772541514..e154c780ce63a2ea1b0e962ea97dc5df9e3d8e7b 100644 (file)
--- a/jjb/mdsal/mdsal-csit-netty-replication.yaml
+++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml
@@ -34,13 +34,6 @@
             odl-mdsal-replicate-netty,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
-      - argon:
-          branch: "stable/argon"
-          install-features: >
-            features-controller,
-            odl-mdsal-replicate-netty,
-            odl-netconf-clustered-topology,
-            odl-clustering-test-app
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 4cd4a5bfd55c4e36b354aa0d4c69a557f7f2def8..8ab40da84de9fc96216c69d9b82b0aa39d4a2e89 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 76a8d750a23ed2a0bc5c50d1e7cc242d0c8e0181..1cf407dd1aa976b9e45aba685359fa134e0b1ba7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index e4fb74490310d48afba56d4fd20737958562e11d..9ad79350b80b053135f3b522ed6d22839f506d38 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 3662685568fb05f2f0a64b6c521e3821b7404a89..6042f5db950eabbc5fd4ece5a1d9aaf94e00e657 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index eded3b6bfd08bb4d5b2565763844bd867ced9ac2..93b4fd5d850632222448620df17e7f791759dada 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index ee50db3eee481cb50e869994f0eca398c91bb102..85c110eaa5e52b202cbdf46e267ede3c16dfe95b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -23,8 +23,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index b18dd0625f99e0e3e7da4a3d512b286544532e73..f82db66e1a52867bcffcfd641a097eb3d1519dbb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index d11f7356dd938888c89e7ddabd6333fb52d7bfe5..5258d34b1a9554b4ebd441e06eeef0ef9b18da7c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 25878e5f9c061cdef9bc00a75bd2599f8d84fc2c..b4642e9b2dc90726ef51dc3c04b82ea2c360d1fa 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -20,8 +20,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 22ea337d032aa3aeccffb655d475b33b56df4447..a88903205c14e832a6151493be57236a71e4de87 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 602383251eadfbe481dc35c42336eb7d515ec0e3..b1a138ce4f70899d14c1b2972cb3f37315b4e47c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index bf48db25710fbcc2462d6029ba66ab807bcd8b50..5443cd8b3e2a7b83bde822e7ab5cc5ee24fd038b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 92a5a319e684757c3801c42e50b75a858931b911..9e10b69a5bdb838aae3af6c2ac172a4790cbb92b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -16,8 +16,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index e12f69d22e795751427e2771ba5518ae783de383..8ae0b6ff5244c206c0028a98706cef950c6a234b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -95,38 +95,6 @@
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-argon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs":
-          mvn-version: mvn38
-          java-version: openjdk17
-      - "{project-name}-rtd-jobs":
-          build-node: centos8-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: "stable/argon"
-    build-timeout: 90
-    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-sonar
     jobs:

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index c92ad4d6f9be95582c63025660ea36d2561700c1..e1816ff54620554726f4f0d97ab3f74edc5cb14d 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 3d4886e3ec62433fa360a10c3c0eb41d08d3f8be..0b6566aabc8bcd345700f135d985929a051a30b7 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -21,8 +21,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - all:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 227abbf36b2a14094d57cc75944e0dba5a2b255c..15245dcf7c90f6950fa04f9f4a964b613cb03def 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -11,8 +11,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     project: "ovsdb"
     archive-artifacts: "*.log"

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 13269a46695d0c4b05cbb6ac1c51e3cfcea72d92..92317a5a16010d3de4fb691483f4f34737732741 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -15,8 +15,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 975de4fb3d05e915a64f3c20c2c2ce37eb537d26..6adfdcac8cc771a667f410db8853a826990a1df2 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -77,32 +77,6 @@
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- project:
-    name: ovsdb-argon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs":
-          mvn-version: mvn38
-          java-version: openjdk17
-      - "{project-name}-rtd-jobs":
-          build-node: centos8-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: "stable/argon"
-    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-sonar
     jobs:

diff --git a/jjb/packaging/helm.yaml b/jjb/packaging/helm.yaml
index aa0eab2d4cd07e2ba02e9255442ab5738eee1859..7767b4652c02cbb612f2298ee47cdc7fabecf32f 100644 (file)
--- a/jjb/packaging/helm.yaml
+++ b/jjb/packaging/helm.yaml
@@ -310,8 +310,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     helm_bin:
       - helm3.7

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index 532b230715ec3d0e922d7f77e2ddb55457fc5e4b..ff5fc8309a2efa3fb21f9df55c6a868adcf20dc5 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -14,8 +14,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 77234e8f0636e53d70217f9bd14ffa4815e95d75..c543d84ffc843455ffc1150977a1d570570fdc82 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -95,38 +95,6 @@
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
-- project:
-    name: serviceutils-argon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs":
-          mvn-version: mvn38
-          java-version: openjdk17
-      - "{project-name}-rtd-jobs":
-          build-node: centos8-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/argon"
-    stream: argon
-
-    project: "serviceutils"
-    project-name: "serviceutils"
-    build-node: centos8-builder-2c-2g
-    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-sonar
     jobs:

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 54a2733e7c735b9867d32ba94721a75479200c40..3db5e2ce703026cfa963d3eb7fcc77e2824cb3ee 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -79,33 +79,6 @@
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-argon
-    jobs:
-      - "{project-name}-rtd-jobs":
-          project-pattern: transportpce
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
-          rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
-      - gerrit-tox-verify:
-          build-timeout: 360
-          build-node: centos8-builder-4c-16g
-          parallel: true
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
-
-    project: "transportpce"
-    project-name: "transportpce"
-    stream: argon
-    branch: "stable/argon"
-    build-node: centos8-builder-2c-2g
-    mvn-settings: "transportpce-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4
-
 - project:
     name: transportpce-release-management
     jobs:
@@ -196,21 +169,3 @@
     email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"
     # Used by the release job
     staging-profile-id: a6927323fa3d4
-
-- project:
-    name: transportpce-models-argon
-    jobs:
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
-
-    project: "transportpce/models"
-    project-name: "transportpce-models"
-    stream: argon
-    branch: "stable/argon"
-    build-node: centos8-builder-2c-2g
-    mvn-settings: "transportpce-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 2673efa936f0d833121f070c9d2b0e6fe33eaeeb..a55ac3930458d7934a5e832160b98978883e341f 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -19,8 +19,6 @@
           branch: "stable/calcium"
       - potassium:
           branch: "stable/potassium"
-      - argon:
-          branch: "stable/argon"
 
     install:
       - only: