Chore: sulfur EOL remove jobs from infra

With stable/argon released sulfur is made EOL.
Remove all sulfur jobs from the infra.

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4691
Change-Id: I62d76f11746213aee5678e0878bae37c84318b29
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 d885bf3f3d1382ef9bc0d8b52cd8928ce56e784d..5a8c790bff7a23b61c4e38945a9d6b6dfb98fa81 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -20,9 +20,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml
index 8a9cba4d38a401c867b6551c01e8ffaed3cfdf5b..a92413ad8b37b1cdba37277c869680f6079ceb38 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/sulfur, stable/chlorine
+            ex: stable/chlorine, stable/argon
       - bool:
           name: DRY_RUN
           default: true
@@ -94,5 +94,3 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"

diff --git a/jjb/autorelease/autorelease-gerrit-branch-lock.sh b/jjb/autorelease/autorelease-gerrit-branch-lock.sh
index e3c6a8bfe17c9f4eb8f26ec94968173da861a9eb..2ab485e2556b4bd5d77185d9426c3a68ee22361b 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/sulfur"
+            echo "ERROR: stable branch should be ex: stable/argon"
             exit 1
         fi
         ;;

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 634c51eefe5e39e5f51509c88b84efb32719a8d4..723bb09196f2744b5ba11539182ff219dd5a548c 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -16,8 +16,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
 
     project: releng/autorelease
     project-name: autorelease
@@ -27,40 +25,6 @@
       **/*.log
     staging-profile-id: 425e43800fea70
 
-- project:
-    name: autorelease-projects-openjdk11
-    jobs:
-      - "autorelease-release-{stream}-{mvn-version}-{java-version}":
-          build-node: centos7-builder-4c-16g
-      - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"
-
-    stream:
-      - sulfur:
-          branch: "stable/sulfur"
-          integration-test: sulfur
-
-    project: releng/autorelease
-    project-name: autorelease
-    build-node: centos7-builder-2c-8g
-    # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
-    archive-artifacts: >
-      **/*.prop
-      **/*.log
-      **/target/surefire-reports/*-output.txt
-      **/target/failsafe-reports/failsafe-summary.xml
-      **/hs_err_*.log
-      **/target/feature/feature.xml
-    staging-profile-id: 425e43800fea70
-    # TODO: **/*.hprof is too large, compress with xz first
-    mvn-params: >
-      -PrepoBuild
-      -P!karaf
-      -Pignore-lispflowmapping-integrationtest
-      -Dcheckstyle.skip=true
-      -Dskip.karaf.featureTest=true
-      -Dsft.heap.max=4g
-    java-version: "openjdk11"
-
 - project:
     name: autorelease-projects-openjdk17
     jobs:

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index fdbbb410290c6183578b82726887eb238ae98a8c..cd23834c2275726377ca5cfbb90dc6a39c41c044 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. Chlorine-SR1, Sulfur-SR1 ...
+            Eg. Chlorine-SR1, Argon-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 3cd352606be61b97b50ed4d768699f42cf758d31..a0cd09810a113a6138056a00479dcd7a9a299f29 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -17,5 +17,3 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"

diff --git a/jjb/autorelease/validate-autorelease-sulfur.yaml b/jjb/autorelease/validate-autorelease-sulfur.yaml
deleted file mode 100644 (file)
index 240cf33..0000000
--- a/jjb/autorelease/validate-autorelease-sulfur.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
-- project:
-    name: autorelease-validate-sulfur
-    jobs:
-      - "{project-name}-validate-autorelease-{stream}"
-    stream: sulfur
-    branch: stable/sulfur
-    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-sulfur.yaml b/jjb/autorelease/view-autorelease-sulfur.yaml
deleted file mode 100644 (file)
index 9330f92..0000000
--- a/jjb/autorelease/view-autorelease-sulfur.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
-- releng_view: &releng_autorelease_view_common_sulfur
-    name: releng-view-autorelease-sulfur
-    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-Sulfur
-    description: "List of Sulfur Merge jobs for Autorelease"
-    job-name:
-      - "daexim-maven-merge-sulfur"
-      - "integration/distribution-maven-merge-sulfur"
-      - "jsonrpc-maven-merge-sulfur"
-      - "lispflowmapping-maven-merge-sulfur"
-      - "openflowplugin-maven-merge-sulfur"
-      - "ovsdb-maven-merge-sulfur"
-      - "serviceutils-maven-merge-sulfur"
-    <<: *releng_autorelease_view_common_sulfur

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 7f90451308599126fb0a3a6511cb466ae2cb490a..54bd58fc576fee2129e66d0325fd2c4b5132d240 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index a91ad19513a1c1f41478a96004d4fa084d251d96..73e67de9297a0d3d9c433d10d320f144539a104f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -20,9 +20,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index dc3455dbb586a2d04264e968e7e2bef99e9ae3d6..d03932140123df47459829d6fcad0c95ddec0e94 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index db38f4116d0ae81ca9b5a84ef1f1d2840697166c..98c7b104d9306df23e15943e58c4bb4fa9179a6d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -22,9 +22,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 1c111dd4d5f94db011c4688e2d0b972fded6c8b9..83dd5de931b091349249490f0b9f21bf893a886c 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index c294ea19178be2c49ba869093add70aff28610c1..b4bf0f2daeae997a0db4889d068509323463d534 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 929b887a8ae9de162469a47d7ec88cd3d4ee7c0d..cfe9c5c8a6f897f344ea303c4110e17c245d43bf 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 2809bc9e0827361c7996b20691b8f99792a3cb63..17dae0046f32c970237e94425135935e2e671e71 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -18,9 +18,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 437437ac7235329b9ae6754029c91913597bfff2..f8fefea22f60685346ecf3c063d7b224df61641a 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 4e09c67d64e2bf71ab2f186cd15a2781fef42bd9..c086977b1cf39004a77b72480fe5371bc3fc0b2d 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -22,9 +22,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 800607c8fce8d0190a24fe915bd4209032770995..82ad119ab6da86fdff7ff25d1bbdc24803b4fab3 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -22,9 +22,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     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 2643292e5de51475866e42902cd5fa3046716b14..25b73802f5011e0c7d18a968443576aedbef695f 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -22,9 +22,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 87ff53bbda7d3a4b54bbbb72e76031967005c43a..18586867bdea7c911058d184e1150d52a4671d98 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -22,9 +22,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 8f3a0a83e8175b9935cf00af05db859075863ef8..8b7c4ee4e261530c2e29c1a7b2777fd1891d2d29 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -22,9 +22,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 7ba09c6ac056c27b1f5ea083d6a1cd6f22f9fe39..2ca9dc07d3d1a4238f545c84d46b28d21c75133c 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -22,9 +22,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 25d463dd2061637e6929680401cf37c3db7cacc0..bfe7e13d3e59303d0b1c34124026cb9c2393973d 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 28ee57eb151ad8bd33f28dc98285c13fdd5b04e7..681c68adb52cd752b946f2dfd6ea86ff17cbe7cc 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 0433296491a88a54ab2613a496407ccbe4938679..d5d7ab909892820e7ebbc81b0d61cca1f7a66dc8 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     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 b9bf121415f9f09c2c0cbb6f924e76a46ee24395..55c15562f8424b9c3ee5a07db4f3c9993a59d8d2 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 1c1bbba7219bf1416f96d9a29202da801238833d..cbd428d9f132557fc9a5ea71a3b42ed3595da8ba 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index 9e9b636963d60692b9a1a3b940159687704b1d2d..cae53fc9520d48b1e291a293501cb5504ac8c506 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 3bd3d38c0e0db5273b7e2e1844e4f2aca63235db..6a9e564a6e99c68395af56b8f6bb46f438fb8eca 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -74,33 +74,6 @@
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-sulfur
-    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-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17
-
-    project: "daexim"
-    project-name: "daexim"
-    stream: sulfur
-    branch: "stable/sulfur"
-    java-version: "openjdk11"
-    mvn-settings: "daexim-settings"
-    build-node: centos8-builder-4c-4g
-    mvn-opts: "-Xmx1024m"
-    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 7559fcdf1b56a67b3559d0eea7ac06e1ba84b489..7b82e4382d55b60a48200aca5ad27c865ca4f89d 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -124,11 +124,11 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/sulfur
+    verify-branch: stable/chlorine
     # Value for ODL_STREAM
-    verify-stream: sulfur
+    verify-stream: chlorine
     verify-karaf-version: karaf4
-    verify-jdkversion: openjdk11
+    verify-jdkversion: openjdk17
 
     # Maven / Java
     java-version: "openjdk8"
@@ -212,36 +212,6 @@
     10-exclude-value: ""
 
     # Manual CSIT job lists used by sanity or periodic in nature.
-    csit-mri-list-sulfur: >
-      aaa-csit-1node-authn-all-sulfur, controller-csit-1node-akka1-all-sulfur,
-      controller-csit-1node-benchmark-all-sulfur,
-      controller-csit-1node-rest-cars-perf-all-sulfur,
-      controller-csit-3node-benchmark-all-sulfur,
-      controller-csit-3node-clustering-ask-all-sulfur,
-      controller-csit-3node-clustering-tell-all-sulfur,
-      controller-csit-3node-rest-clust-cars-perf-ask-only-sulfur,
-      controller-csit-3node-rest-clust-cars-perf-tell-only-sulfur,
-      mdsal-csit-3node-netty-replicate-only-sulfur,
-      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-sulfur
-    csit-weekly-list-sulfur: >
-      controller-csit-1node-notifications-longevity-only-sulfur,
-      controller-csit-3node-drb-partnheal-longevity-only-sulfur,
-      controller-csit-3node-drb-precedence-longevity-only-sulfur,
-      controller-csit-3node-ddb-expl-lead-movement-longevity-only-sulfur,
-      bgpcep-csit-3node-bgpclustering-longevity-only-sulfur,
-      distribution-deploy-sulfur,
-      distribution-offline-sulfur,
-      openflowplugin-csit-1node-longevity-only-sulfur
-    csit-sanity-list-sulfur: >
-      openflowplugin-csit-1node-sanity-only-sulfur,
-      distribution-sanity-sulfur
     csit-mri-list-chlorine: >
       aaa-csit-1node-authn-all-chlorine,
       controller-csit-1node-akka1-all-chlorine,

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 339e42d1ef428a6b053636c6a7ac72b173e39c24..304d4b9f4cb7a81f6388c33114c2f74909858723 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -6,12 +6,12 @@
       - gerrit-tox-verify
 
     stream:
-      - argon:
+      - potassium:
           branch: "master"
+      - argon:
+          branch: "stable/master"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
 
     project: docs
     project-name: docs

diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml
index f137efede3f428fbf335827884571687610042be..f55e1b1087a4e2b6cd43b21fc98ec03fcc428b8d 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: Sulfur, Phosphorus."
+          description: "The next release name eg: Chlorine, Argon."
       - bool:
           name: PUBLISH
           default: false

diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh
index bbfa29db9619e01c233658733c4ae6bac1cbed0f..6af92e70cf3e177e5caf4184edd083d85eb56f79 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: Chlorine, Sulfur."
+    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Chlorine, Argon."
     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 e67989678d64d72ad6d9da0807a90c6e835c0f31..9dad0ec5c800850c70f9b033a865282965be1443 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 Chlorine, Sulfur."
+    echo "    release_name:  The release_name e.g Chlorine, Argon."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }

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

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 2bfd82b2036d57681853667ef5eb5974e75e16ff..1917bd1e53378ef651d7cd18d7382ef1a0d6955a 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -32,9 +32,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: openjdk11
 
 - project:
     name: distribution-managed
@@ -89,16 +86,6 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
-          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-full
@@ -135,11 +122,6 @@
           branch: "stable/chlorine"
           dependencies: >
             distribution-merge-managed-{stream},
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
-          dependencies: >
-            distribution-merge-managed-{stream},
 
 - project:
     name: distribution-release
@@ -170,9 +152,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
 
 - project:
     name: distribution-release-management
@@ -229,8 +208,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
 
 - project:
     name: distribution-docker-release

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 7bfa2495b2724579d075e0189661c5df760fabbc..d89b827c15117a0c2ca05cb9dc8cb29e2a9c17f9 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -43,14 +43,6 @@
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
             integration/distribution
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-sulfur.lst
-          build-order: >
-            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
-            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
-            integration/distribution
 
 - project:
     name: integration-distribution
@@ -90,19 +82,6 @@
           csit-list: !include: csit-jobs-chlorine.lst
           csit-mri-list: "{csit-mri-list-chlorine}"
           csit-weekly-list: "{csit-weekly-list-chlorine}"
-      - sulfur:
-          branch: "stable/sulfur"
-          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-sulfur.lst
-          csit-mri-list: "{csit-mri-list-sulfur}"
-          csit-weekly-list: "{csit-weekly-list-sulfur}"
 
 - project:
     name: integration-sanity
@@ -120,10 +99,6 @@
           branch: "stable/chlorine"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-chlorine}"
-      - sulfur:
-          branch: "stable/sulfur"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-sulfur}"
 
 - job-template:
     name: "integration-merge-dashboard"

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index eee55caa48bc2e6ba8eab73516274b1ebd037f8b..d294e25f3612a2779133d42d6c1bc1cb7e99b0de 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index ee4622949556537825348ae05dc1848fea62112a..92a0ef8ba808dff86236a65a9e92ed00410d3891 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -74,33 +74,6 @@
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-sulfur
-    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-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17
-
-    project: "jsonrpc"
-    project-name: "jsonrpc"
-    stream: sulfur
-    java-version: "openjdk11"
-    branch: "stable/sulfur"
-    mvn-settings: "jsonrpc-settings"
-    build-node: centos8-builder-4c-4g
-    mvn-opts: "-Xmx1024m"
-    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/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 54bec093b948ab58c94f23f85a96b18ea41c775e..a26653295de618ef6912709a6dfce852aa6de529 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -16,9 +16,6 @@
       - chlorine:
           branch: "master"
           jre: "openjdk17"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 46d9624aa6c9c76c39c9d256ba63e98cee98f553..e60203e42d9bae643000bb5cac17ff195e7e951e 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -16,9 +16,6 @@
       - chlorine:
           branch: "master"
           jre: "openjdk17"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 33a89ae12bbf82e1dd3ad0ff7e941d5c0b647a0d..5ae218c6b4fa53e46e86c9228892eed7d06abd11 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -17,9 +17,6 @@
       - chlorine:
           branch: "master"
           jre: "openjdk17"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index fd94fa5aeb781cd347998756ec2cdea662b42403..5065c037935d4e8f85f508a587972390e620fb3a 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index ea68c3e0b89bee9a9da911199ed5134ec337b42f..a3f6f6087d344b3c66ad93f14cec54ffffd88e83 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -98,40 +98,6 @@
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-sulfur
-    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-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17
-
-    stream: sulfur
-    project: "lispflowmapping"
-    project-name: "lispflowmapping"
-    branch: "stable/sulfur"
-    java-version: "openjdk11"
-    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 7fb4dae779823b6d65bd932cb8170134d77c4ea7..fbf51b9fb88890439ef0568d29baf9aab6f835cd 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
index 6809f5fe3a9f4400eadbac57bdebbf3cd039fe0d..78d426e4beedbf20eaa2edf74140f17b11800c61 100644 (file)
--- a/jjb/mdsal/mdsal-csit-netty-replication.yaml
+++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml
@@ -35,15 +35,6 @@
             odl-restconf-nb-bierman02,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
-          install-features: >
-            features-controller,
-            odl-mdsal-replicate-netty,
-            odl-restconf-nb-bierman02,
-            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 0e9d71c5003a20c32176cc962228b5806aff8298..c35a7a24d10327a1cd209f736ba9635bac4e9ac3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 000d2a2c9a5e1093a42cdaec87590b2e90c1d01d..4eb3ad0776ecc5c01f1b4d7bb636c09327232a1e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 10162625f3e162370f0f4879da6fd2a2c93796e4..6823bcc7da06fe6691f3b8a138310e0a8de58b25 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index aeaebfcaa3821b490ed72297996959e6c62538ff..508e5d9ece8682c49fa4a2a05057e25d686a660f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 557486688434df3c4a9335fc1b6144e2aaa139b2..114b3c560d083787f626c5d77b85834926024092 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -24,10 +24,6 @@
       - chlorine:
           branch: "stable/chlorine"
           install: "all"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
-          install: "all"
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 31a0e5b07627ca16f8c012c3641055e2433e6640..9853c3abb3c4a40d2fbca08997b823da931ad206 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -23,9 +23,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 9471b89f0de60e8eae03fbb814691562c99e6e92..d90cf221c7edb04fb609785c17753b3b64498bee 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -23,9 +23,6 @@
           install: "all"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 75348513f3fc163bad42f12bca64e7fdef541cda..9df62629e7827d148b737d42129d3d514303b3d8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 0d5e4ca61d6218d4308cb2fd41edb1cacbdac0a3..953fe6cb24830a525bca3cd4b6cc1275dd8db25c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -20,9 +20,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index eccf5c7687a4363a4b28f23277a6c0679e5f0924..7b5f4843bd8f25f22d6f259635b38164bf99bc2f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index b0a93e300f632f1c0bd48901c10ee5c59441eb1b..4b9c68d780b5b4bd80e5861dd7870f78abe5ec40 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 6142b108bcb58adae7d14dcf4423e0b751e68cdc..9c9e05d8808f5cf281d9b2dc91430f7b8c32ee2a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index abcd17eb5b96cb68301146bf5a98f0e57f84a683..cbb1446489c267e683f23551162e58e5967707b8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -17,9 +17,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 0d709d6716d43763bf59a6146797295d3caef720..43965f9575f2f7eb7c34dc5e60fc875056a4edf0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -98,40 +98,6 @@
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-sulfur
-    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-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17
-
-    stream: sulfur
-    project: "openflowplugin"
-    project-name: "openflowplugin"
-    branch: "stable/sulfur"
-    build-node: centos8-builder-4c-4g
-    build-timeout: 90
-    java-version: "openjdk11"
-    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 9f24d58d9bed92baadd549f19f135cc7cbc02966..466abaf4fca98c039371fe0ab1ad2e9b8e8c9188 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 67e5fc4bccb03f2d89fc1616474785c3fd009b46..dd4459913dc8a328d92929b2f043dec9a6f803a9 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -21,9 +21,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 49788a665a153558e38868425c283a3b8135672d..35ac34907c94657d6c3c5209c7d8b8bbcfa0b5d8 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -13,9 +13,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
 
     project: "ovsdb"
     archive-artifacts: "*.log"

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index e5eeace23ad9da7667c3937c7fe8668cfdcefeef..0c9e215b7dabe434562991ab7b9062e06f2279ba 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -16,9 +16,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index cbb4ac456a6bcae8ebf5c51883a1c82e48f5820c..f4c5adb7cd8d8cac913e7725bd886375ece57892 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -80,33 +80,6 @@
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- project:
-    name: ovsdb-sulfur
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: sulfur
-    project: "ovsdb"
-    project-name: "ovsdb"
-    branch: "stable/sulfur"
-    build-node: centos7-builder-4c-4g
-    java-version: "openjdk11"
-    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 30d0ed8ff2c8e4ebd9ba2c99cb40914baecf4579..60155e8ed368fb73fb5758eff042ba9d2112ee63 100644 (file)
--- a/jjb/packaging/helm.yaml
+++ b/jjb/packaging/helm.yaml
@@ -304,10 +304,12 @@
       helm3.7 package .
 
     stream:
-      - chlorine:
+      - potassium:
           branch: "master"
-      - sulfur:
-          branch: "stable/sulfur"
+      - argon:
+          branch: "stable/argon"
+      - chlorine:
+          branch: "stable/chlorine"
 
     helm_bin:
       - helm3.7

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index f618f9437091b75b73cc5871bde26b1a2a25eea3..d824095ea21f5fba41e61947fdf9e932879c935e 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -15,9 +15,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 817b975e8ea854681001fd3eba24dd9cad3920ef..a016706b450c204b67e645252a0d6d8079e6bf9b 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -95,40 +95,6 @@
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
-- project:
-    name: serviceutils-sulfur
-    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-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17
-
-    branch: "stable/sulfur"
-    stream: sulfur
-
-    project: "serviceutils"
-    project-name: "serviceutils"
-    build-node: centos8-builder-2c-2g
-    java-version: "openjdk11"
-    mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
-    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 71d8d1b02afda1f83b6b324f6deff9429cec675e..1e064c5ed09f2b37250d056c25de24a504a29b55 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -82,34 +82,6 @@
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-sulfur
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          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: centos7-builder-4c-16g
-          parallel: true
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: "transportpce"
-    project-name: "transportpce"
-    stream: sulfur
-    branch: "stable/sulfur"
-    java-version: "openjdk11"
-    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:

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 3100e874e9432102255096c618966d1650caff8f..3f81f9797030288c6172b1bf26907d79a08cbc7a 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -19,9 +19,6 @@
           branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
 
     install:
       - only: