From 1479200e41074649b668378b9c8fbd1e8e485481 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 23 Nov 2022 21:11:06 +1000 Subject: [PATCH] CI: Remove stable/phosphorus jobs With Chlorine released stable/phosphorus support is EOL. The jobs are no longer required, therefore purge these jobs from releng/builder. Signed-off-by: Anil Belur Change-Id: Idd902eefc1a52d793bad0da7a0566f1050878a02 --- jjb/aaa/aaa-csit-authn.yaml | 3 -- jjb/autorelease/autorelease-branch-lock.yaml | 2 -- jjb/autorelease/autorelease-projects.yaml | 3 -- jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 -- .../validate-autorelease-phosphorus.yaml | 23 ------------ .../view-autorelease-phosphorus.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 | 25 ------------- jjb/defaults.yaml | 35 ++----------------- jjb/docs/docs-rtd.yaml | 2 -- jjb/docs/docs_version_bump.sh | 2 +- jjb/docs/docs_version_bump_projects.sh | 2 +- jjb/integration/csit-jobs-phosphorus.lst | 20 ----------- .../distribution/distribution-jobs.yaml | 27 -------------- jjb/integration/integration-test-jobs.yaml | 26 -------------- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 3 -- jjb/jsonrpc/jsonrpc.yaml | 25 ------------- .../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 | 32 ----------------- 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 | 4 --- jjb/openflowplugin/openflowplugin.yaml | 32 ----------------- 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 | 4 --- jjb/ovsdb/ovsdb.yaml | 26 -------------- jjb/packaging/helm.yaml | 2 -- jjb/serviceutils/serviceutils-patch-test.yaml | 4 --- jjb/serviceutils/serviceutils.yaml | 32 ----------------- jjb/transportpce/transportpce.yaml | 28 --------------- jjb/yangtools/yangtools-csit-system.yaml | 3 -- 69 files changed, 5 insertions(+), 529 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-phosphorus.yaml delete mode 100644 jjb/autorelease/view-autorelease-phosphorus.yaml delete mode 100644 jjb/integration/csit-jobs-phosphorus.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 04e9ba427..b8c5cd056 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -21,9 +21,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - all: diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml index 542148e5b..25ba3e5c8 100644 --- a/jjb/autorelease/autorelease-branch-lock.yaml +++ b/jjb/autorelease/autorelease-branch-lock.yaml @@ -94,5 +94,3 @@ branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" - - phosphorus: - branch: "stable/phosphorus" diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 7a5e69fcb..701b5faba 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -16,9 +16,6 @@ - sulfur: branch: "stable/sulfur" integration-test: sulfur - - phosphorus: - branch: "stable/phosphorus" - integration-test: phosphorus project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 5e05e7787..fdbbb4102 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. Sulfur-SR1, Phosphorus-SR2 ... + Eg. Chlorine-SR1, Sulfur-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 b5386641a..87bb4d389 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -17,5 +17,3 @@ branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" - - phosphorus: - branch: "stable/phosphorus" diff --git a/jjb/autorelease/validate-autorelease-phosphorus.yaml b/jjb/autorelease/validate-autorelease-phosphorus.yaml deleted file mode 100644 index ca626e745..000000000 --- a/jjb/autorelease/validate-autorelease-phosphorus.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-phosphorus - jobs: - - "{project-name}-validate-autorelease-{stream}" - stream: phosphorus - branch: stable/phosphorus - 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-phosphorus.yaml b/jjb/autorelease/view-autorelease-phosphorus.yaml deleted file mode 100644 index d8739cd95..000000000 --- a/jjb/autorelease/view-autorelease-phosphorus.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job -- releng_view: &releng_autorelease_view_common_phosphorus - name: releng-view-autorelease-phosphorus - 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-Phosphorus - description: "List of Phosphorus Merge jobs for Autorelease" - job-name: - - "daexim-maven-merge-phosphorus" - - "integration/distribution-maven-merge-phosphorus" - - "jsonrpc-maven-merge-phosphorus" - - "lispflowmapping-maven-merge-phosphorus" - - "openflowplugin-maven-merge-phosphorus" - - "ovsdb-maven-merge-phosphorus" - - "serviceutils-maven-merge-phosphorus" - <<: *releng_autorelease_view_common_phosphorus diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index c01bb8039..dd1702ce5 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index f4de205fc..27919b3b7 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -21,9 +21,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 54ae9d0b0..48ceac268 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 99f2e9ff8..7a7690dc4 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -23,9 +23,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index b07fe93a6..a6d4c08e2 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 60e34f634..263f84ebf 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 9d7ba8d5f..c9cb261e5 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 7428dbd94..0d0a1c5ee 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -19,9 +19,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 437ec6f53..0bef63d19 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - 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 7ca84904f..aba4cd92d 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -23,9 +23,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 583e9d80e..81010983f 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -23,9 +23,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - 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 692ac7140..798162968 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -23,9 +23,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 3add89a18..e944d5934 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -23,9 +23,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 01c8cdbee..008a44f48 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -23,9 +23,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 92c6760b1..0158bf7dd 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -23,9 +23,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 930a5740c..eb84962d3 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index f05801344..1dd93ce6a 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - 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 2857f7997..2e3aa124f 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - 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 c7d3436e3..fb769e98d 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 6edc22a3a..73a137185 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index fdd81bb1a..9e2aac295 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 9319983ad..1e307543d 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -76,31 +76,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-phosphorus - 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 - - project: "daexim" - project-name: "daexim" - stream: phosphorus - branch: "stable/phosphorus" - java-version: "openjdk11" - mvn-settings: "daexim-settings" - 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 0570d3c64..b38c33961 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/phosphorus + verify-branch: stable/sulfur # Value for ODL_STREAM - verify-stream: phosphorus + verify-stream: sulfur verify-karaf-version: karaf4 verify-jdkversion: openjdk11 @@ -212,37 +212,6 @@ 10-exclude-value: "" # Manual CSIT job lists used by sanity or periodic in nature. - csit-mri-list-phosphorus: > - aaa-csit-1node-authn-all-phosphorus, - controller-csit-1node-akka1-all-phosphorus, - controller-csit-1node-benchmark-all-phosphorus, - controller-csit-1node-rest-cars-perf-all-phosphorus, - controller-csit-3node-benchmark-all-phosphorus, - controller-csit-3node-clustering-ask-all-phosphorus, - controller-csit-3node-clustering-tell-all-phosphorus, - controller-csit-3node-rest-clust-cars-perf-ask-only-phosphorus, - controller-csit-3node-rest-clust-cars-perf-tell-only-phosphorus, - mdsal-csit-3node-netty-replicate-only-phosphorus, - 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-phosphorus - csit-weekly-list-phosphorus: > - controller-csit-1node-notifications-longevity-only-phosphorus, - controller-csit-3node-drb-partnheal-longevity-only-phosphorus, - controller-csit-3node-drb-precedence-longevity-only-phosphorus, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-phosphorus, - bgpcep-csit-3node-bgpclustering-longevity-only-phosphorus, - distribution-deploy-phosphorus, - distribution-offline-phosphorus, - openflowplugin-csit-1node-longevity-only-phosphorus - csit-sanity-list-phosphorus: > - openflowplugin-csit-1node-sanity-only-phosphorus, - distribution-sanity-phosphorus csit-mri-list-sulfur: > aaa-csit-1node-authn-all-sulfur, controller-csit-1node-akka1-all-sulfur, controller-csit-1node-benchmark-all-sulfur, diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index edffa352b..339e42d1e 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" - - phosphorus: - branch: "stable/phosphorus" project: docs project-name: docs diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh index 54b241ec3..bbfa29db9 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: Sulfur, Phosphorus." + echo " RELEASE_NAME: The RELEASE_NAME eg: Chlorine, Sulfur." 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 99099b9e1..e67989678 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 Sulfur, Phosphorus." + echo " release_name: The release_name e.g Chlorine, Sulfur." echo " PUBLISH: Set to true to PUBLISH" echo "" } diff --git a/jjb/integration/csit-jobs-phosphorus.lst b/jjb/integration/csit-jobs-phosphorus.lst deleted file mode 100644 index 07f041b9d..000000000 --- a/jjb/integration/csit-jobs-phosphorus.lst +++ /dev/null @@ -1,20 +0,0 @@ -bgpcep-csit-1node-bgp-ingest-all-phosphorus, -bgpcep-csit-1node-bgp-ingest-mixed-all-phosphorus, -bgpcep-csit-1node-throughpcep-all-phosphorus, -bgpcep-csit-1node-userfeatures-all-phosphorus, -daexim-csit-1node-basic-only-phosphorus, -daexim-csit-3node-clustering-basic-only-phosphorus, -distribution-csit-managed-phosphorus, -jsonrpc-csit-1node-basic-only-phosphorus, -openflowplugin-csit-1node-cbench-only-phosphorus, -openflowplugin-csit-1node-flow-services-all-phosphorus, -openflowplugin-csit-1node-perf-bulkomatic-only-phosphorus, -openflowplugin-csit-1node-perf-stats-collection-only-phosphorus, -openflowplugin-csit-1node-scale-link-only-phosphorus, -openflowplugin-csit-1node-scale-only-phosphorus, -openflowplugin-csit-1node-scale-switch-only-phosphorus, -openflowplugin-csit-3node-clustering-bulkomatic-only-phosphorus, -openflowplugin-csit-3node-clustering-only-phosphorus, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-phosphorus, -ovsdb-csit-1node-upstream-southbound-all-phosphorus, -ovsdb-csit-3node-upstream-clustering-only-phosphorus, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 5a40f9774..32830d986 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -33,10 +33,6 @@ - sulfur: branch: "stable/sulfur" java-version: openjdk11 - - phosphorus: - branch: "stable/phosphorus" - mvn-version: mvn35 - java-version: openjdk11 - project: name: distribution-managed @@ -92,17 +88,6 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, - - phosphorus: - branch: "stable/phosphorus" - mvn-version: mvn35 - 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 @@ -140,12 +125,6 @@ java-version: "openjdk11" dependencies: > distribution-merge-managed-{stream}, - - phosphorus: - branch: "stable/phosphorus" - mvn-version: mvn35 - java-version: "openjdk11" - dependencies: > - distribution-merge-managed-{stream}, - project: name: distribution-release @@ -176,10 +155,6 @@ - sulfur: branch: "stable/sulfur" java-version: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - mvn-version: mvn35 - java-version: "openjdk11" - project: name: distribution-release-management @@ -236,8 +211,6 @@ branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" - - phosphorus: - branch: "stable/phosphorus" - project: name: distribution-docker-release diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 994684cea..5c911eeee 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -44,15 +44,6 @@ odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - - phosphorus: - branch: "stable/phosphorus" - mvn-version: "mvn35" - java-version: "openjdk11" - csit-list: !include: csit-jobs-phosphorus.lst - build-order: > - odlparent infrautils yangtools mdsal controller aaa netconf bgpcep - serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping - integration/distribution - project: name: integration-distribution @@ -105,19 +96,6 @@ csit-list: !include: csit-jobs-sulfur.lst csit-mri-list: "{csit-mri-list-sulfur}" csit-weekly-list: "{csit-weekly-list-sulfur}" - - phosphorus: - branch: "stable/phosphorus" - 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-phosphorus.lst - csit-mri-list: "{csit-mri-list-phosphorus}" - csit-weekly-list: "{csit-weekly-list-phosphorus}" - project: name: integration-sanity @@ -139,10 +117,6 @@ branch: "stable/sulfur" karaf-version: odl csit-sanity-list: "{csit-sanity-list-sulfur}" - - phosphorus: - branch: "stable/phosphorus" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-phosphorus}" - job-template: name: "integration-merge-dashboard" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 58ef5fcf1..3be300150 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index eecfc0d9d..bc480e680 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -76,31 +76,6 @@ # Used by the release job staging-profile-id: 96fdf4408765d -- project: - name: jsonrpc-phosphorus - 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 - - project: "jsonrpc" - project-name: "jsonrpc" - stream: phosphorus - java-version: "openjdk11" - branch: "stable/phosphorus" - mvn-settings: "jsonrpc-settings" - 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 5c6ac54a5..54bec093b 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -19,9 +19,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 5fd05aae8..46d9624aa 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -19,9 +19,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 7456efb43..33a89ae12 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 4afe5b45b..1ae1b1d00 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index bb6b0fbfb..928ba580a 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -99,38 +99,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-phosphorus - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs" - - "{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 - - stream: phosphorus - project: "lispflowmapping" - project-name: "lispflowmapping" - branch: "stable/phosphorus" - 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: centos7-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 34d042837..8bb9c3ec7 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 516ec6dfd..ffd041a49 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -37,15 +37,6 @@ odl-restconf-nb-bierman02, odl-netconf-clustered-topology, odl-clustering-test-app - - phosphorus: - branch: "stable/phosphorus" - 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 c94994473..2e94f42f1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 68e9d842d..eca792dcc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - 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 2572e5635..4271ef1e9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index ec2fa8697..e6bf86dbd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 286ceee88..fe3124a3b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -25,10 +25,6 @@ branch: "stable/sulfur" jre: "openjdk11" install: "all" - - phosphorus: - branch: "stable/phosphorus" - 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 27c28e2a7..1d06f6005 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -24,9 +24,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 190819352..c3ee4b8ef 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -23,9 +23,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - 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 c09a5938f..d3e6dee93 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 64a5f2e43..362c3e1f2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -21,9 +21,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index a24bae30e..5e71e3bb7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index ba26e0162..d175964bc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 5bffe82a7..3459916ec 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 731d65467..12a821972 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -18,10 +18,6 @@ - sulfur: branch: "stable/sulfur" java-version: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - java-version: "openjdk11" - mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 5f2f1e29b..9a802a4d1 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -99,38 +99,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-phosphorus - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs" - - "{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 - - stream: phosphorus - project: "openflowplugin" - project-name: "openflowplugin" - branch: "stable/phosphorus" - build-node: centos7-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 6bb490bac..ebc4c7ecc 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 162ea31b3..e0e5ffb2c 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -22,9 +22,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index bb1acbdb8..70162dd48 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -14,9 +14,6 @@ - sulfur: branch: "stable/sulfur" java-version: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - 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 a592224df..bddbd9042 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -17,10 +17,6 @@ - sulfur: branch: "stable/sulfur" java-version: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - java-version: "openjdk11" - mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 57c13671d..ecf8664d0 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -80,32 +80,6 @@ # Used by the release job staging-profile-id: a68b188166958 -- project: - name: ovsdb-phosphorus - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs" - - "{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: phosphorus - project: "ovsdb" - project-name: "ovsdb" - branch: "stable/phosphorus" - 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 9d95315a3..30d0ed8ff 100644 --- a/jjb/packaging/helm.yaml +++ b/jjb/packaging/helm.yaml @@ -308,8 +308,6 @@ branch: "master" - sulfur: branch: "stable/sulfur" - - phosphorus: - branch: stable/phosphorus helm_bin: - helm3.7 diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 6467534e5..431bee124 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -16,10 +16,6 @@ - sulfur: branch: "stable/sulfur" java-version: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - java-version: "openjdk11" - mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index f995f26e6..d29645de4 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -97,38 +97,6 @@ # Used by the release job staging-profile-id: 12cc4ba8bf01ba -- project: - name: serviceutils-phosphorus - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs" - - "{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 - - branch: "stable/phosphorus" - stream: phosphorus - - project: "serviceutils" - project-name: "serviceutils" - build-node: centos7-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 41c97bfe8..fe190bab1 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-phosphorus - 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: 240 - build-node: centos7-builder-4c-16g - parallel: true - - odl-maven-jobs-jdk11 - - odl-maven-verify-jobs - - project: "transportpce" - project-name: "transportpce" - stream: phosphorus - branch: "stable/phosphorus" - 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 94f3906af..40b89e991 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -20,9 +20,6 @@ - sulfur: branch: "stable/sulfur" jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" install: - only: -- 2.36.6