From 9ea56d64081fbdc43541133069cd83f5c6f4b914 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Fri, 26 Apr 2024 15:34:17 +1000 Subject: [PATCH] Chore: Remove stable/argon jobs Remove "stable/argon" from the Jenkins infra since Calcuium is released and Scandium is moved to the master. All jobs with stable/argon branch is marked EOL and no longer required. Change-Id: Ia74536fefdf18cf9c0e3fb721a7f740ebe421afc Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 2 - jjb/autorelease/autorelease-branch-lock.yaml | 4 +- .../autorelease-gerrit-branch-lock.sh | 2 +- jjb/autorelease/autorelease-projects.yaml | 5 -- jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 - .../validate-autorelease-argon.yaml | 23 ---------- jjb/autorelease/view-autorelease-argon.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 | 33 +------------ 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-argon.lst | 20 -------- .../distribution/distribution-jobs.yaml | 46 +++++++------------ jjb/integration/integration-test-jobs.yaml | 24 ---------- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 2 - jjb/jsonrpc/jsonrpc.yaml | 23 ---------- .../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 - 68 files changed, 24 insertions(+), 488 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-argon.yaml delete mode 100644 jjb/autorelease/view-autorelease-argon.yaml delete mode 100644 jjb/integration/csit-jobs-argon.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index cf860ee0d..b2029a98e 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -20,8 +20,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml index fca05110e..df19755bf 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/potassium, stable/argon + ex: stable/potassium, stable/calcium - bool: name: DRY_RUN default: true @@ -94,5 +94,3 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" diff --git a/jjb/autorelease/autorelease-gerrit-branch-lock.sh b/jjb/autorelease/autorelease-gerrit-branch-lock.sh index 2ab485e25..e3d5d94a2 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/argon" + echo "ERROR: stable branch should be ex: stable/calcium" exit 1 fi ;; diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 85935b18f..0be2b31d2 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -15,8 +15,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" project: releng/autorelease project-name: autorelease @@ -44,9 +42,6 @@ - potassium: branch: "stable/potassium" integration-test: potassium - - argon: - branch: "stable/argon" - integration-test: argon project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 411fd0402..3d451a336 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. Potassium-SR1, Argon-SR1 ... + Eg. Potassium-SR1, Calcium-SR1 ... scm: - lf-infra-gerrit-scm: git-url: "$GIT_URL/$GERRIT_PROJECT" diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index f87225c2a..35afd7ae3 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -17,5 +17,3 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" diff --git a/jjb/autorelease/validate-autorelease-argon.yaml b/jjb/autorelease/validate-autorelease-argon.yaml deleted file mode 100644 index b25eee457..000000000 --- a/jjb/autorelease/validate-autorelease-argon.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-argon - jobs: - - "{project-name}-validate-autorelease-{stream}" - stream: argon - branch: stable/argon - project-name: - - daexim: - project: daexim - - integration-distribution: - project: integration/distribution - - jsonrpc: - project: jsonrpc - - lispflowmapping: - project: lispflowmapping - - openflowplugin: - project: openflowplugin - - ovsdb: - project: ovsdb - - serviceutils: - project: serviceutils diff --git a/jjb/autorelease/view-autorelease-argon.yaml b/jjb/autorelease/view-autorelease-argon.yaml deleted file mode 100644 index 747559a3d..000000000 --- a/jjb/autorelease/view-autorelease-argon.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job -- _releng_view: &releng_autorelease_view_common_argon - name: releng-view-autorelease-argon - view-type: list - filter-executors: false - filter-queue: false - columns: - - status - - weather - - job - - last-success - - last-failure - - last-duration - - build-button - - jacoco - - find-bugs - - robot-list - recurse: false - -- view: - name: Merge-Argon - description: "List of Argon Merge jobs for Autorelease" - job-name: - - "daexim-maven-merge-argon" - - "integration/distribution-maven-merge-argon" - - "jsonrpc-maven-merge-argon" - - "lispflowmapping-maven-merge-argon" - - "openflowplugin-maven-merge-argon" - - "ovsdb-maven-merge-argon" - - "serviceutils-maven-merge-argon" - <<: *releng_autorelease_view_common_argon diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index caf633500..c2ab3c5ea 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/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 4b731bdcd..05a71472f 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -20,8 +20,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 858d6d08a..667997239 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index b0fe8ee97..96a553863 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -22,8 +22,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 6fccacaf8..ca43b4369 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 30e17aa24..d40db5166 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 2f527a63a..494f81885 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" karaf-version: bgpcep diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 78c2ece9b..09547813a 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -18,8 +18,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 3328d4c21..5b778a54d 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index c673ff87e..f1eb5abce 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/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 25e1a3adf..f946a66c5 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -22,8 +22,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 241ec4554..b1ff2f623 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/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 25a03e8db..938b718b3 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -22,8 +22,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 0177e7d0f..6afe53fb2 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -22,8 +22,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 98c560460..941a99611 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -22,8 +22,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 64248d043..4fccc963a 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index f4ccc061b..337fef730 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index b7528c1e9..c5a727a4d 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/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 9c7ee3aca..14ee52d0e 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/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 3059b71c8..4d8c082f3 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 6188e35db..14836acca 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 92d3a94b5..60210c340 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-argon - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: daexim - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/ - rtd-token: 76284f12638574f131cdccdf257d852d07c195fc - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "daexim" - project-name: "daexim" - stream: argon - branch: "stable/argon" - mvn-settings: "daexim-settings" - dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" - email-upstream: "[daexim] [odlparent] [yangtools] [controller]" - - # Used by the release job - staging-profile-id: 96e4dade34bd7 - - project: name: daexim-sonar jobs: diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 045baf77b..c6f830f8e 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -127,9 +127,9 @@ # Data for csit-verify jobs # Branch for "last" version detection - verify-branch: stable/argon + verify-branch: stable/potassium # Value for ODL_STREAM - verify-stream: argon + verify-stream: potassium verify-karaf-version: karaf4 verify-jdkversion: openjdk17 @@ -214,35 +214,6 @@ 10-inclusion-flag: "off" 10-exclude-value: "" - # Manual CSIT job lists used by sanity or periodic in nature. - csit-mri-list-argon: > - aaa-csit-1node-authn-all-argon, - controller-csit-1node-akka1-all-argon, - controller-csit-1node-benchmark-all-argon, - controller-csit-1node-rest-cars-perf-all-argon, - controller-csit-3node-benchmark-all-argon, - controller-csit-3node-clustering-ask-all-argon, - controller-csit-3node-clustering-tell-all-argon, - controller-csit-3node-rest-clust-cars-perf-ask-only-argon, - controller-csit-3node-rest-clust-cars-perf-tell-only-argon, - mdsal-csit-3node-netty-replicate-only-argon, - netconf-csit-1node-callhome-only-master, - netconf-csit-1node-scale-max-devices-only-master, - netconf-csit-1node-scale-only-master, - netconf-csit-1node-userfeatures-all-master, - netconf-csit-3node-clustering-only-master, - netconf-csit-3node-clustering-scale-only-master, - yangtools-csit-1node-system-only-argon - csit-weekly-list-argon: > - controller-csit-1node-notifications-longevity-only-argon, - controller-csit-3node-drb-partnheal-longevity-only-argon, - controller-csit-3node-drb-precedence-longevity-only-argon, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-argon, - bgpcep-csit-3node-bgpclustering-longevity-only-argon, - openflowplugin-csit-1node-longevity-only-argon - csit-sanity-list-argon: > - openflowplugin-csit-1node-sanity-only-argon, - distribution-sanity-argon csit-mri-list-potassium: > aaa-csit-1node-authn-all-potassium, controller-csit-1node-akka1-all-potassium, diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 18ec7dbc8..8f6bd56c7 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" project: docs project-name: docs diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml index 527596735..f8981036c 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: Argon, Potassium." + description: "The next release name eg: Calcium, Potassium." - bool: name: PUBLISH default: false diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh index 7e4c5b988..ac1041725 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: Argon, Potassium." + echo " RELEASE_NAME: The RELEASE_NAME eg: Calcium, Potassium." echo " PUBLISH: Set to true to PUBLISH" echo "" } diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh index 45c6f2850..5b1c17f90 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 Argon, Potassium." + echo " release_name: The release_name e.g Calcium, Potassium." echo " PUBLISH: Set to true to PUBLISH" echo "" } diff --git a/jjb/integration/csit-jobs-argon.lst b/jjb/integration/csit-jobs-argon.lst deleted file mode 100644 index ad9493113..000000000 --- a/jjb/integration/csit-jobs-argon.lst +++ /dev/null @@ -1,20 +0,0 @@ -bgpcep-csit-1node-bgp-ingest-all-argon, -bgpcep-csit-1node-bgp-ingest-mixed-all-argon, -bgpcep-csit-1node-throughpcep-all-argon, -bgpcep-csit-1node-userfeatures-all-argon, -daexim-csit-1node-basic-only-argon, -daexim-csit-3node-clustering-basic-only-argon, -distribution-csit-managed-argon, -jsonrpc-csit-1node-basic-only-argon, -openflowplugin-csit-1node-cbench-only-argon, -openflowplugin-csit-1node-flow-services-all-argon, -openflowplugin-csit-1node-perf-bulkomatic-only-argon, -openflowplugin-csit-1node-perf-stats-collection-only-argon, -openflowplugin-csit-1node-scale-link-only-argon, -openflowplugin-csit-1node-scale-only-argon, -openflowplugin-csit-1node-scale-switch-only-argon, -openflowplugin-csit-3node-clustering-bulkomatic-only-argon, -openflowplugin-csit-3node-clustering-only-argon, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-argon, -ovsdb-csit-1node-upstream-southbound-all-argon, -ovsdb-csit-3node-upstream-clustering-only-argon, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index dcba0ef54..4a0565be2 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -24,12 +24,12 @@ nexus-iq-stage: release email-upstream: "[int/dist]" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" - project: name: distribution-managed @@ -53,35 +53,21 @@ jre: "openjdk17" karaf-version: karaf4 dist-pom: "distribution/pom.xml" + dependencies: > + daexim-maven-merge-{stream}, + jsonrpc-maven-merge-{stream}, + lispflowmapping-maven-merge-{stream}, + openflowplugin-maven-merge-{stream}, + ovsdb-maven-merge-{stream}, + serviceutils-maven-merge-{stream}, stream: - - calcium: + - scandium: branch: "master" - dependencies: > - daexim-maven-merge-{stream}, - jsonrpc-maven-merge-{stream}, - lispflowmapping-maven-merge-{stream}, - openflowplugin-maven-merge-{stream}, - ovsdb-maven-merge-{stream}, - serviceutils-maven-merge-{stream}, + - calcium: + branch: "stable/master" - potassium: branch: "stable/potassium" - dependencies: > - daexim-maven-merge-{stream}, - jsonrpc-maven-merge-{stream}, - lispflowmapping-maven-merge-{stream}, - openflowplugin-maven-merge-{stream}, - ovsdb-maven-merge-{stream}, - serviceutils-maven-merge-{stream}, - - argon: - branch: "stable/argon" - dependencies: > - daexim-maven-merge-{stream}, - jsonrpc-maven-merge-{stream}, - lispflowmapping-maven-merge-{stream}, - openflowplugin-maven-merge-{stream}, - ovsdb-maven-merge-{stream}, - serviceutils-maven-merge-{stream}, - project: name: distribution-sonar @@ -113,12 +99,12 @@ jobs: - "{project-name}-gerrit-docker-jobs" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" - project: name: distribution-docker-release diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 9c395414e..3ac00be7f 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 - - argon: - branch: "stable/argon" - csit-list: !include: csit-jobs-argon.lst - build-order: > - odlparent infrautils yangtools mdsal controller aaa netconf bgpcep - serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping - integration/distribution - project: name: integration-distribution @@ -101,19 +94,6 @@ csit-list: !include: csit-jobs-potassium.lst csit-mri-list: "{csit-mri-list-potassium}" csit-weekly-list: "{csit-weekly-list-potassium}" - - argon: - branch: "stable/argon" - csit-blocklist: > - aaa controller genius lispflowmapping l2switch mdsal - netconf netvirt odlmicro sxp yangtools - gate longevity sanity tdd tempest wip - bgpcep-csit-3node-bgpclustering-all - bgpcep-csit-3node-bgpclustering-ha-only - openflowplugin-csit-1node-bundle-based-reconciliation - last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used - csit-list: !include: csit-jobs-argon.lst - csit-mri-list: "{csit-mri-list-argon}" - csit-weekly-list: "{csit-weekly-list-argon}" - project: name: integration-sanity @@ -135,10 +115,6 @@ branch: "stable/potassium" karaf-version: odl csit-sanity-list: "{csit-sanity-list-potassium}" - - argon: - branch: "stable/argon" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-argon}" - job-template: name: "integration-merge-dashboard" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 1b18f0010..1f8afc083 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 2f7431d59..d8a80d67e 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-argon - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: jsonrpc - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/ - rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "jsonrpc" - project-name: "jsonrpc" - stream: argon - branch: "stable/argon" - mvn-settings: "jsonrpc-settings" - dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" - email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]" - - # Used by the release job - staging-profile-id: 96fdf4408765d - - project: name: jsonrpc-release-management jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index f91440b81..607518a43 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 81d62521f..46adbd8d2 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-argon - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs": - mvn-version: mvn38 - java-version: openjdk17 - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: lispflowmapping - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/ - rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8 - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - stream: argon - project: "lispflowmapping" - project-name: "lispflowmapping" - branch: "stable/argon" - mvn-settings: "lispflowmapping-settings" - mvn-goals: "clean deploy -DrepoBuild" - mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true" - dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}" - email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]" - archive-artifacts: > - **/*.log - **/target/surefire-reports/*-output.txt - - build-node: centos8-builder-8c-8g - - # Used by the release job - staging-profile-id: 96fff2503b766 - - project: name: lispflowmapping-sonar jobs: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 4cea6652c..c571c7726 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 9cb6c101c..e154c780c 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 - - argon: - branch: "stable/argon" - install-features: > - features-controller, - odl-mdsal-replicate-netty, - odl-netconf-clustered-topology, - odl-clustering-test-app install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 4cd4a5bfd..8ab40da84 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 76a8d750a..1cf407dd1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index e4fb74490..9ad79350b 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/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 366268556..6042f5db9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index eded3b6bf..93b4fd5d8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index ee50db3ee..85c110eaa 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -23,8 +23,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index b18dd0625..f82db66e1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index d11f7356d..5258d34b1 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/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 25878e5f9..b4642e9b2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -20,8 +20,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 22ea337d0..a88903205 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 602383251..b1a138ce4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index bf48db257..5443cd8b3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 92a5a319e..9e10b69a5 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -16,8 +16,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index e12f69d22..8ae0b6ff5 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-argon - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs": - mvn-version: mvn38 - java-version: openjdk17 - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - doc-dir: .tox/docs/tmp/html - project-pattern: openflowplugin - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/ - rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - stream: argon - project: "openflowplugin" - project-name: "openflowplugin" - branch: "stable/argon" - build-timeout: 90 - mvn-settings: "openflowplugin-settings" - mvn-goals: "clean deploy javadoc:aggregate" - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]" - # Used by the release job - staging-profile-id: a68a76dc1b44c - - project: name: openflowplugin-sonar jobs: diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index c92ad4d6f..e1816ff54 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 3d4886e3e..0b6566aab 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -21,8 +21,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 227abbf36..15245dcf7 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -11,8 +11,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" project: "ovsdb" archive-artifacts: "*.log" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 13269a466..92317a5a1 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -15,8 +15,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 975de4fb3..6adfdcac8 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-argon - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs": - mvn-version: mvn38 - java-version: openjdk17 - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: ovsdb - rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/ - rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - stream: argon - project: "ovsdb" - project-name: "ovsdb" - branch: "stable/argon" - mvn-settings: "ovsdb-settings" - dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" - email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]" - - # Used by the release job - staging-profile-id: a68b188166958 - - project: name: ovsdb-sonar jobs: diff --git a/jjb/packaging/helm.yaml b/jjb/packaging/helm.yaml index aa0eab2d4..7767b4652 100644 --- a/jjb/packaging/helm.yaml +++ b/jjb/packaging/helm.yaml @@ -310,8 +310,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" helm_bin: - helm3.7 diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 532b23071..ff5fc8309 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -14,8 +14,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 77234e8f0..c543d84ff 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-argon - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs": - mvn-version: mvn38 - java-version: openjdk17 - - "{project-name}-rtd-jobs": - build-node: centos8-builder-2c-2g - project-pattern: serviceutils - rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/ - rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4 - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - branch: "stable/argon" - stream: argon - - project: "serviceutils" - project-name: "serviceutils" - build-node: centos8-builder-2c-2g - mvn-settings: "serviceutils-settings" - build-timeout: 90 - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - infrautils-merge-{stream} - email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]" - # Used by the release job - staging-profile-id: 12cc4ba8bf01ba - - project: name: serviceutils-sonar jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 54a2733e7..3db5e2ce7 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-argon - jobs: - - "{project-name}-rtd-jobs": - project-pattern: transportpce - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/ - rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd - - gerrit-tox-verify: - build-timeout: 360 - build-node: centos8-builder-4c-16g - parallel: true - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "transportpce" - project-name: "transportpce" - stream: argon - branch: "stable/argon" - build-node: centos8-builder-2c-2g - mvn-settings: "transportpce-settings" - mvn-opts: "-Xmx1024m" - dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" - email-upstream: "[transportpce] [odlparent] [yangtools] [controller]" - - # Used by the release job - staging-profile-id: a6927323fa3d4 - - project: name: transportpce-release-management jobs: @@ -196,21 +169,3 @@ email-upstream: "[transportpce] [odlparent] [yangtools] [controller]" # Used by the release job staging-profile-id: a6927323fa3d4 - -- project: - name: transportpce-models-argon - jobs: - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "transportpce/models" - project-name: "transportpce-models" - stream: argon - branch: "stable/argon" - build-node: centos8-builder-2c-2g - mvn-settings: "transportpce-settings" - mvn-opts: "-Xmx1024m" - dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" - email-upstream: "[transportpce] [odlparent] [yangtools] [controller]" - # Used by the release job - staging-profile-id: a6927323fa3d4 diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 2673efa93..a55ac3930 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -19,8 +19,6 @@ branch: "stable/calcium" - potassium: branch: "stable/potassium" - - argon: - branch: "stable/argon" install: - only: -- 2.36.6