From 62dc74903f0e09cc1cec3a04127f050f854528c5 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sun, 16 Apr 2023 22:17:45 +1000 Subject: [PATCH] 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 --- jjb/aaa/aaa-csit-authn.yaml | 3 -- jjb/autorelease/autorelease-branch-lock.yaml | 4 +-- .../autorelease-gerrit-branch-lock.sh | 2 +- jjb/autorelease/autorelease-projects.yaml | 36 ------------------- jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 -- .../validate-autorelease-sulfur.yaml | 23 ------------ jjb/autorelease/view-autorelease-sulfur.yaml | 32 ----------------- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 3 -- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 3 -- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 3 -- .../bgpcep-csit-bgpclustering-longevity.yaml | 3 -- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 3 -- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 3 -- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 3 -- jjb/controller/controller-csit-akka1.yaml | 3 -- .../controller-csit-clustering.yaml | 3 -- .../controller-csit-cs-chasing-leader.yaml | 3 -- .../controller-csit-cs-partnheal.yaml | 3 -- ...ontroller-csit-ddb-expl-lead-movement.yaml | 3 -- .../controller-csit-dnb-noloss.yaml | 3 -- .../controller-csit-drb-partnheal.yaml | 3 -- .../controller-csit-drb-precedence.yaml | 3 -- .../controller-csit-dsbenchmark-cluster.yaml | 3 -- .../controller-csit-dsbenchmark.yaml | 3 -- .../controller-csit-rest-cars-perf.yaml | 3 -- .../controller-csit-rest-clust-cars-perf.yaml | 3 -- jjb/daexim/daexim-csit-basic.yaml | 3 -- jjb/daexim/daexim-csit-clustering-basic.yaml | 3 -- jjb/daexim/daexim.yaml | 27 -------------- jjb/defaults.yaml | 36 ++----------------- jjb/docs/docs-rtd.yaml | 6 ++-- jjb/docs/docs-template.yaml | 2 +- jjb/docs/docs_version_bump.sh | 2 +- jjb/docs/docs_version_bump_projects.sh | 2 +- jjb/integration/csit-jobs-sulfur.lst | 20 ----------- .../distribution/distribution-jobs.yaml | 23 ------------ jjb/integration/integration-test-jobs.yaml | 25 ------------- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 3 -- jjb/jsonrpc/jsonrpc.yaml | 27 -------------- .../l2switch-csit-host-scalability-daily.yaml | 3 -- jjb/l2switch/l2switch-csit-scalability.yaml | 3 -- jjb/l2switch/l2switch-csit-switch.yaml | 3 -- .../lispflowmapping-csit-msmr.yaml | 3 -- jjb/lispflowmapping/lispflowmapping.yaml | 34 ------------------ jjb/mdsal/mdsal-csit-bindingv1.yaml | 3 -- jjb/mdsal/mdsal-csit-netty-replication.yaml | 9 ----- .../openflowplugin-csit-cbench.yaml | 3 -- ...flowplugin-csit-clustering-bulkomatic.yaml | 3 -- ...lugin-csit-clustering-perf-bulkomatic.yaml | 3 -- .../openflowplugin-csit-clustering.yaml | 3 -- .../openflowplugin-csit-flow-services.yaml | 4 --- .../openflowplugin-csit-longevity.yaml | 3 -- .../openflowplugin-csit-perf-bulkomatic.yaml | 3 -- ...flowplugin-csit-perf-stats-collection.yaml | 3 -- .../openflowplugin-csit-sanity.yaml | 3 -- .../openflowplugin-csit-scale-link.yaml | 3 -- .../openflowplugin-csit-scale-switch.yaml | 3 -- .../openflowplugin-csit-scale.yaml | 3 -- .../openflowplugin-patch-test.yaml | 3 -- jjb/openflowplugin/openflowplugin.yaml | 34 ------------------ jjb/ovsdb/ovsdb-csit-clustering.yaml | 3 -- jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 -- jjb/ovsdb/ovsdb-full-integration.yaml | 3 -- jjb/ovsdb/ovsdb-patch-test.yaml | 3 -- jjb/ovsdb/ovsdb.yaml | 27 -------------- jjb/packaging/helm.yaml | 8 +++-- jjb/serviceutils/serviceutils-patch-test.yaml | 3 -- jjb/serviceutils/serviceutils.yaml | 34 ------------------ jjb/transportpce/transportpce.yaml | 28 --------------- jjb/yangtools/yangtools-csit-system.yaml | 3 -- 71 files changed, 17 insertions(+), 570 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-sulfur.yaml delete mode 100644 jjb/autorelease/view-autorelease-sulfur.yaml delete mode 100644 jjb/integration/csit-jobs-sulfur.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index d885bf3f3..5a8c790bf 100644 --- 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 8a9cba4d3..a92413ad8 100644 --- 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 e3c6a8bfe..2ab485e25 100644 --- 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 634c51eef..723bb0919 100644 --- 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 fdbbb4102..cd23834c2 100644 --- 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 3cd352606..a0cd09810 100644 --- 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 index 240cf3333..000000000 --- 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 index 9330f9293..000000000 --- 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 7f9045130..54bd58fc5 100644 --- 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 a91ad1951..73e67de92 100644 --- 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 dc3455dbb..d03932140 100644 --- 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 db38f4116..98c7b104d 100644 --- 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 1c111dd4d..83dd5de93 100644 --- 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 c294ea191..b4bf0f2da 100644 --- 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 929b887a8..cfe9c5c8a 100644 --- 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 2809bc9e0..17dae0046 100644 --- 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 437437ac7..f8fefea22 100644 --- 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 4e09c67d6..c086977b1 100644 --- 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 800607c8f..82ad119ab 100644 --- 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 2643292e5..25b73802f 100644 --- 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 87ff53bbd..18586867b 100644 --- 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 8f3a0a83e..8b7c4ee4e 100644 --- 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 7ba09c6ac..2ca9dc07d 100644 --- 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 25d463dd2..bfe7e13d3 100644 --- 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 28ee57eb1..681c68adb 100644 --- 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 043329649..d5d7ab909 100644 --- 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 b9bf12141..55c15562f 100644 --- 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 1c1bbba72..cbd428d9f 100644 --- 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 9e9b63696..cae53fc95 100644 --- 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 3bd3d38c0..6a9e564a6 100644 --- 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 7559fcdf1..7b82e4382 100644 --- 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 339e42d1e..304d4b9f4 100644 --- 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 f137efede..f55e1b108 100644 --- 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 bbfa29db9..6af92e70c 100644 --- a/jjb/docs/docs_version_bump.sh +++ b/jjb/docs/docs_version_bump.sh @@ -12,7 +12,7 @@ update_file_usage () { echo "Usage: $0 " 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 e67989678..9dad0ec5c 100644 --- 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 " 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 index edc97c78f..000000000 --- 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 2bfd82b20..1917bd1e5 100644 --- 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 7bfa2495b..d89b827c1 100644 --- 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 eee55caa4..d294e25f3 100644 --- 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 ee4622949..92a0ef8ba 100644 --- 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 54bec093b..a26653295 100644 --- 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 46d9624aa..e60203e42 100644 --- 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 33a89ae12..5ae218c6b 100644 --- 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 fd94fa5ae..5065c0379 100644 --- 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 ea68c3e0b..a3f6f6087 100644 --- 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 7fb4dae77..fbf51b9fb 100644 --- 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 6809f5fe3..78d426e4b 100644 --- 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 0e9d71c50..c35a7a24d 100644 --- 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 000d2a2c9..4eb3ad077 100644 --- 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 10162625f..6823bcc7d 100644 --- 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 aeaebfcaa..508e5d9ec 100644 --- 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 557486688..114b3c560 100644 --- 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 31a0e5b07..9853c3abb 100644 --- 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 9471b89f0..d90cf221c 100644 --- 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 75348513f..9df62629e 100644 --- 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 0d5e4ca61..953fe6cb2 100644 --- 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 eccf5c768..7b5f4843b 100644 --- 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 b0a93e300..4b9c68d78 100644 --- 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 6142b108b..9c9e05d88 100644 --- 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 abcd17eb5..cbb144648 100644 --- 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 0d709d671..43965f957 100644 --- 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 9f24d58d9..466abaf4f 100644 --- 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 67e5fc4bc..dd4459913 100644 --- 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 49788a665..35ac34907 100644 --- 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 e5eeace23..0c9e215b7 100644 --- 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 cbb4ac456..f4c5adb7c 100644 --- 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 30d0ed8ff..60155e8ed 100644 --- 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 f618f9437..d824095ea 100644 --- 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 817b975e8..a016706b4 100644 --- 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 71d8d1b02..1e064c5ed 100644 --- 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 3100e874e..3f81f9797 100644 --- 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: -- 2.36.6