From ec3d2e747746255ed49dad2df4d6c0283f8b8a9c Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 26 Oct 2023 18:34:22 +1000 Subject: [PATCH] Chore: Chlorine EOL remove jobs from infra With stable/potassium released chlorine is made EOL. Remove all chlorine jobs from the infra. Issue: LF-JIRA RELENG-4961 Change-Id: Icf9f3dce83bb13b254620da47cccd16ca0a7b12e Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 2 - jjb/autorelease/autorelease-branch-lock.yaml | 4 +- jjb/autorelease/autorelease-projects.yaml | 5 --- jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 - .../validate-autorelease-chlorine.yaml | 23 ---------- .../view-autorelease-chlorine.yaml | 32 ------------- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 2 - .../bgpcep-csit-bgpclustering-longevity.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 2 - jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 2 - jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 2 - jjb/controller/controller-csit-akka1.yaml | 2 - .../controller-csit-clustering.yaml | 2 - .../controller-csit-cs-chasing-leader.yaml | 2 - .../controller-csit-cs-partnheal.yaml | 2 - ...ontroller-csit-ddb-expl-lead-movement.yaml | 2 - .../controller-csit-dnb-noloss.yaml | 2 - .../controller-csit-drb-partnheal.yaml | 2 - .../controller-csit-drb-precedence.yaml | 2 - .../controller-csit-dsbenchmark-cluster.yaml | 2 - .../controller-csit-dsbenchmark.yaml | 2 - .../controller-csit-rest-cars-perf.yaml | 2 - .../controller-csit-rest-clust-cars-perf.yaml | 2 - jjb/daexim/daexim-csit-basic.yaml | 2 - jjb/daexim/daexim-csit-clustering-basic.yaml | 2 - jjb/daexim/daexim.yaml | 23 ---------- jjb/defaults.yaml | 34 +------------- jjb/docs/docs-rtd.yaml | 2 - 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-chlorine.lst | 20 --------- .../distribution/distribution-jobs.yaml | 13 ------ jjb/integration/integration-test-jobs.yaml | 24 ---------- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 2 - jjb/jsonrpc/jsonrpc.yaml | 23 ---------- .../l2switch-csit-host-scalability-daily.yaml | 2 +- jjb/l2switch/l2switch-csit-scalability.yaml | 2 +- jjb/l2switch/l2switch-csit-switch.yaml | 2 +- .../lispflowmapping-csit-msmr.yaml | 2 - jjb/lispflowmapping/lispflowmapping.yaml | 33 -------------- jjb/mdsal/mdsal-csit-bindingv1.yaml | 2 - jjb/mdsal/mdsal-csit-netty-replication.yaml | 7 --- .../openflowplugin-csit-cbench.yaml | 2 - ...flowplugin-csit-clustering-bulkomatic.yaml | 2 - ...lugin-csit-clustering-perf-bulkomatic.yaml | 2 - .../openflowplugin-csit-clustering.yaml | 2 - .../openflowplugin-csit-flow-services.yaml | 2 - .../openflowplugin-csit-longevity.yaml | 2 - .../openflowplugin-csit-perf-bulkomatic.yaml | 2 - ...flowplugin-csit-perf-stats-collection.yaml | 2 - .../openflowplugin-csit-sanity.yaml | 2 - .../openflowplugin-csit-scale-link.yaml | 2 - .../openflowplugin-csit-scale-switch.yaml | 2 - .../openflowplugin-csit-scale.yaml | 2 - .../openflowplugin-patch-test.yaml | 2 - jjb/openflowplugin/openflowplugin.yaml | 32 ------------- jjb/ovsdb/ovsdb-csit-clustering.yaml | 2 - jjb/ovsdb/ovsdb-csit-southbound.yaml | 2 - jjb/ovsdb/ovsdb-full-integration.yaml | 2 - jjb/ovsdb/ovsdb-patch-test.yaml | 2 - jjb/ovsdb/ovsdb.yaml | 26 ----------- jjb/packaging/helm.yaml | 2 - jjb/serviceutils/serviceutils-patch-test.yaml | 2 - jjb/serviceutils/serviceutils.yaml | 32 ------------- jjb/transportpce/transportpce.yaml | 45 ------------------- jjb/yangtools/yangtools-csit-system.yaml | 2 - 70 files changed, 10 insertions(+), 474 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-chlorine.yaml delete mode 100644 jjb/autorelease/view-autorelease-chlorine.yaml delete mode 100644 jjb/integration/csit-jobs-chlorine.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index db028846f..d16065d5e 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -20,8 +20,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - all: diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml index 5a0acff28..0dd616194 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/chlorine, stable/argon + ex: stable/potassium, stable/argon - bool: name: DRY_RUN default: true @@ -94,5 +94,3 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index ebd0f1113..9c87e5422 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -15,8 +15,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" project: releng/autorelease project-name: autorelease @@ -44,9 +42,6 @@ - argon: branch: "stable/argon" integration-test: argon - - chlorine: - branch: "stable/chlorine" - integration-test: chlorine project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 7b18dcffb..411fd0402 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, Argon-SR1 ... + Eg. Potassium-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 2e0a2014c..183e0e703 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -17,5 +17,3 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" diff --git a/jjb/autorelease/validate-autorelease-chlorine.yaml b/jjb/autorelease/validate-autorelease-chlorine.yaml deleted file mode 100644 index b20f44d38..000000000 --- a/jjb/autorelease/validate-autorelease-chlorine.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-chlorine - jobs: - - "{project-name}-validate-autorelease-{stream}" - stream: chlorine - branch: stable/chlorine - 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-chlorine.yaml b/jjb/autorelease/view-autorelease-chlorine.yaml deleted file mode 100644 index 819293aca..000000000 --- a/jjb/autorelease/view-autorelease-chlorine.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job -- _releng_view: &releng_autorelease_view_common_chlorine - name: releng-view-autorelease-chlorine - 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-Chlorine - description: "List of Chlorine Merge jobs for Autorelease" - job-name: - - "daexim-maven-merge-chlorine" - - "integration/distribution-maven-merge-chlorine" - - "jsonrpc-maven-merge-chlorine" - - "lispflowmapping-maven-merge-chlorine" - - "openflowplugin-maven-merge-chlorine" - - "ovsdb-maven-merge-chlorine" - - "serviceutils-maven-merge-chlorine" - <<: *releng_autorelease_view_common_chlorine diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 34f3c9fc8..22ec0d196 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 1f823b313..fdfe7f48b 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -20,8 +20,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index bb0ca6b9c..64790eb84 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 79be73946..ff59f3d6b 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -22,8 +22,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 68e207e66..fc8359e86 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 9dfe49898..b4bfc3205 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 816633a23..1c3858002 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" karaf-version: bgpcep diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 24a435ff2..bae98c1b2 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -18,8 +18,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index eb94941dc..27ff48158 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index c1ab33009..9109e34a4 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -22,8 +22,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 0f282cc2f..7455d93a2 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -22,8 +22,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" 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 367ccba94..9d22eb5f5 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -22,8 +22,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 35258303a..abc20191e 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -22,8 +22,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 019ea48f2..bf635321b 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -22,8 +22,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 46e8de14e..d5578b254 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -22,8 +22,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 27372f5b8..9974100fc 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 7c01571e3..e690e28c8 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 65f231dcd..7ac24cd1c 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" 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 e6a0f52e5..f804a10fc 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 4e4d70b36..68962f9ea 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 9618b7f52..c4a7fe5b4 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 324fad9af..ed3b8f1ea 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -68,29 +68,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-chlorine - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: daexim - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/ - rtd-token: 76284f12638574f131cdccdf257d852d07c195fc - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "daexim" - project-name: "daexim" - stream: chlorine - branch: "stable/chlorine" - mvn-settings: "daexim-settings" - dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" - email-upstream: "[daexim] [odlparent] [yangtools] [controller]" - - # Used by the release job - staging-profile-id: 96e4dade34bd7 - - project: name: daexim-sonar jobs: diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 8cfbdda65..163566e10 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -124,9 +124,9 @@ # Data for csit-verify jobs # Branch for "last" version detection - verify-branch: stable/chlorine + verify-branch: stable/argon # Value for ODL_STREAM - verify-stream: chlorine + verify-stream: argon verify-karaf-version: karaf4 verify-jdkversion: openjdk17 @@ -212,36 +212,6 @@ 10-exclude-value: "" # Manual CSIT job lists used by sanity or periodic in nature. - csit-mri-list-chlorine: > - aaa-csit-1node-authn-all-chlorine, - controller-csit-1node-akka1-all-chlorine, - controller-csit-1node-benchmark-all-chlorine, - controller-csit-1node-rest-cars-perf-all-chlorine, - controller-csit-3node-benchmark-all-chlorine, - controller-csit-3node-clustering-ask-all-chlorine, - controller-csit-3node-clustering-tell-all-chlorine, - controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine, - controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine, - mdsal-csit-3node-netty-replicate-only-chlorine, - netconf-csit-1node-callhome-only-master, - netconf-csit-1node-scale-max-devices-only-master, - netconf-csit-1node-scale-only-master, - netconf-csit-1node-userfeatures-all-master, - netconf-csit-3node-clustering-only-master, - netconf-csit-3node-clustering-scale-only-master, - yangtools-csit-1node-system-only-chlorine - csit-weekly-list-chlorine: > - controller-csit-1node-notifications-longevity-only-chlorine, - controller-csit-3node-drb-partnheal-longevity-only-chlorine, - controller-csit-3node-drb-precedence-longevity-only-chlorine, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine, - bgpcep-csit-3node-bgpclustering-longevity-only-chlorine, - distribution-deploy-chlorine, - distribution-offline-chlorine, - openflowplugin-csit-1node-longevity-only-chlorine - csit-sanity-list-chlorine: > - openflowplugin-csit-1node-sanity-only-chlorine, - distribution-sanity-chlorine csit-mri-list-argon: > aaa-csit-1node-authn-all-argon, controller-csit-1node-akka1-all-argon, diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 39f85460e..3c036a853 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" project: docs project-name: docs diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml index f55e1b108..527596735 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: Chlorine, Argon." + description: "The next release name eg: Argon, Potassium." - bool: name: PUBLISH default: false diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh index 6af92e70c..7e4c5b988 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, Argon." + echo " RELEASE_NAME: The RELEASE_NAME eg: Argon, Potassium." echo " PUBLISH: Set to true to PUBLISH" echo "" } diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh index 9dad0ec5c..45c6f2850 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, Argon." + echo " release_name: The release_name e.g Argon, Potassium." echo " PUBLISH: Set to true to PUBLISH" echo "" } diff --git a/jjb/integration/csit-jobs-chlorine.lst b/jjb/integration/csit-jobs-chlorine.lst deleted file mode 100644 index 4e99cb409..000000000 --- a/jjb/integration/csit-jobs-chlorine.lst +++ /dev/null @@ -1,20 +0,0 @@ -bgpcep-csit-1node-bgp-ingest-all-chlorine, -bgpcep-csit-1node-bgp-ingest-mixed-all-chlorine, -bgpcep-csit-1node-throughpcep-all-chlorine, -bgpcep-csit-1node-userfeatures-all-chlorine, -daexim-csit-1node-basic-only-chlorine, -daexim-csit-3node-clustering-basic-only-chlorine, -distribution-csit-managed-chlorine, -jsonrpc-csit-1node-basic-only-chlorine, -openflowplugin-csit-1node-cbench-only-chlorine, -openflowplugin-csit-1node-flow-services-all-chlorine, -openflowplugin-csit-1node-perf-bulkomatic-only-chlorine, -openflowplugin-csit-1node-perf-stats-collection-only-chlorine, -openflowplugin-csit-1node-scale-link-only-chlorine, -openflowplugin-csit-1node-scale-only-chlorine, -openflowplugin-csit-1node-scale-switch-only-chlorine, -openflowplugin-csit-3node-clustering-bulkomatic-only-chlorine, -openflowplugin-csit-3node-clustering-only-chlorine, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-chlorine, -ovsdb-csit-1node-upstream-southbound-all-chlorine, -ovsdb-csit-3node-upstream-clustering-only-chlorine, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index f13c31b22..b2c208926 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -30,8 +30,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" - project: name: distribution-managed @@ -84,15 +82,6 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, - - chlorine: - branch: "stable/chlorine" - dependencies: > - daexim-maven-merge-{stream}, - jsonrpc-maven-merge-{stream}, - lispflowmapping-maven-merge-{stream}, - openflowplugin-maven-merge-{stream}, - ovsdb-maven-merge-{stream}, - serviceutils-maven-merge-{stream}, - project: name: distribution-sonar @@ -130,8 +119,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" - project: name: distribution-docker-release diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 17ab952fd..9041340e0 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -42,13 +42,6 @@ odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - - chlorine: - branch: "stable/chlorine" - csit-list: !include: csit-jobs-chlorine.lst - build-order: > - odlparent infrautils yangtools mdsal controller aaa netconf bgpcep - serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping - integration/distribution - project: name: integration-distribution @@ -101,19 +94,6 @@ csit-list: !include: csit-jobs-argon.lst csit-mri-list: "{csit-mri-list-argon}" csit-weekly-list: "{csit-weekly-list-argon}" - - chlorine: - branch: "stable/chlorine" - csit-blocklist: > - aaa controller 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-chlorine.lst - csit-mri-list: "{csit-mri-list-chlorine}" - csit-weekly-list: "{csit-weekly-list-chlorine}" - project: name: integration-sanity @@ -135,10 +115,6 @@ branch: "stable/argon" karaf-version: odl csit-sanity-list: "{csit-sanity-list-argon}" - - chlorine: - branch: "stable/chlorine" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-chlorine}" - job-template: name: "integration-merge-dashboard" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 46378d980..dcc063478 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index e28710c8a..1db37039a 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -68,29 +68,6 @@ # Used by the release job staging-profile-id: 96fdf4408765d -- project: - name: jsonrpc-chlorine - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: jsonrpc - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/ - rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "jsonrpc" - project-name: "jsonrpc" - stream: chlorine - branch: "stable/chlorine" - mvn-settings: "jsonrpc-settings" - dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" - email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]" - - # Used by the release job - staging-profile-id: 96fdf4408765d - - project: name: jsonrpc-release-management jobs: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index a26653295..acb711ce2 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -13,7 +13,7 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" jre: "openjdk17" diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index e60203e42..290b3b46f 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -13,7 +13,7 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" jre: "openjdk17" diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 5ae218c6b..f627590b0 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -14,7 +14,7 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" jre: "openjdk17" diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index a6099f3a3..1a4fcf79d 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 7f273eaee..ea09f9b43 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -98,39 +98,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-chlorine - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs": - mvn-version: mvn38 - java-version: openjdk17 - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: lispflowmapping - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/ - rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8 - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - stream: chlorine - project: "lispflowmapping" - project-name: "lispflowmapping" - branch: "stable/chlorine" - 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 46a628bc7..e2fd772ce 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 039d218fc..95d177541 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -34,13 +34,6 @@ odl-mdsal-replicate-netty, odl-netconf-clustered-topology, odl-clustering-test-app - - chlorine: - branch: "stable/chlorine" - install-features: > - features-controller, - odl-mdsal-replicate-netty, - odl-netconf-clustered-topology, - odl-clustering-test-app install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 437c4e30c..1cbf51674 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 04f18dcb9..624a8c8f6 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 7bb731df9..89ddb8202 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 1303797aa..28f717ef8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index f119967f7..3a666bdc3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 10c75eeb9..080d161f9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -23,8 +23,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index c45cdd366..ee57079af 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 7ad41637f..aaaad52bf 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index aadbe1d32..44ee6c565 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -20,8 +20,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 0ba66a8fa..57145bec7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 6aafbcad8..b9ad26bc4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 7bc3bc637..df1ad7706 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index ba482e788..938619381 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -16,8 +16,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 3a1b55698..20ab92e58 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -95,38 +95,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-chlorine - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs": - mvn-version: mvn38 - java-version: openjdk17 - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - doc-dir: .tox/docs/tmp/html - project-pattern: openflowplugin - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/ - rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - stream: chlorine - project: "openflowplugin" - project-name: "openflowplugin" - branch: "stable/chlorine" - build-timeout: 90 - mvn-settings: "openflowplugin-settings" - mvn-goals: "clean deploy javadoc:aggregate" - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]" - # Used by the release job - staging-profile-id: a68a76dc1b44c - - project: name: openflowplugin-sonar jobs: diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index e6f7ada80..2fa7ffe2a 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 521faeefb..89eaabe68 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -21,8 +21,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 501761790..1fb06f623 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -11,8 +11,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" project: "ovsdb" archive-artifacts: "*.log" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index a791e7bc0..080c4175a 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -15,8 +15,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index d5d03e28c..b4b60443e 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -77,32 +77,6 @@ # Used by the release job staging-profile-id: a68b188166958 -- project: - name: ovsdb-chlorine - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs": - mvn-version: mvn38 - java-version: openjdk17 - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: ovsdb - rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/ - rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - stream: chlorine - project: "ovsdb" - project-name: "ovsdb" - branch: "stable/chlorine" - 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 128b5bf5f..280c37f50 100644 --- a/jjb/packaging/helm.yaml +++ b/jjb/packaging/helm.yaml @@ -310,8 +310,6 @@ branch: "stable/potassium" - 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 3c0add412..ebd35e746 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -14,8 +14,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 630c36200..b1dc179ea 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -95,38 +95,6 @@ # Used by the release job staging-profile-id: 12cc4ba8bf01ba -- project: - name: serviceutils-chlorine - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs": - mvn-version: mvn38 - java-version: openjdk17 - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: serviceutils - rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/ - rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4 - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - branch: "stable/chlorine" - stream: chlorine - - project: "serviceutils" - project-name: "serviceutils" - build-node: centos8-builder-2c-2g - mvn-settings: "serviceutils-settings" - build-timeout: 90 - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - infrautils-merge-{stream} - email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]" - # Used by the release job - staging-profile-id: 12cc4ba8bf01ba - - project: name: serviceutils-sonar jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index a33ef04e7..50b050c67 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -79,33 +79,6 @@ # Used by the release job staging-profile-id: a6927323fa3d4 -- project: - name: transportpce-chlorine - jobs: - - "{project-name}-rtd-jobs": - project-pattern: transportpce - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/ - rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd - - gerrit-tox-verify: - build-timeout: 360 - build-node: centos8-builder-4c-16g - parallel: true - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "transportpce" - project-name: "transportpce" - stream: chlorine - branch: "stable/chlorine" - build-node: centos8-builder-2c-2g - mvn-settings: "transportpce-settings" - mvn-opts: "-Xmx1024m" - dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" - email-upstream: "[transportpce] [odlparent] [yangtools] [controller]" - - # Used by the release job - staging-profile-id: a6927323fa3d4 - - project: name: transportpce-release-management jobs: @@ -196,21 +169,3 @@ email-upstream: "[transportpce] [odlparent] [yangtools] [controller]" # Used by the release job staging-profile-id: a6927323fa3d4 - -- project: - name: transportpce-models-chlorine - jobs: - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "transportpce/models" - project-name: "transportpce-models" - stream: chlorine - branch: "stable/chlorine" - build-node: centos8-builder-2c-2g - mvn-settings: "transportpce-settings" - mvn-opts: "-Xmx1024m" - dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" - email-upstream: "[transportpce] [odlparent] [yangtools] [controller]" - # Used by the release job - staging-profile-id: a6927323fa3d4 diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 9e136edee..f8e47ea78 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -19,8 +19,6 @@ branch: "stable/potassium" - argon: branch: "stable/argon" - - chlorine: - branch: "stable/chlorine" install: - only: -- 2.36.6