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 <abelur@linuxfoundation.org>
Change-Id: Idd902eefc1a52d793bad0da7a0566f1050878a02

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 04e9ba427a2a1ff79d9b651c2f727925def21a06..b8c5cd0566c4ff97579d69a3bad57aa8e82d3c83 100644 (file)
--- 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 542148e5b9005dfacd162d19d5a7cc7414034a05..25ba3e5c860b56a1c07635e7403c4a755b276ec9 100644 (file)
--- 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 7a5e69fcb99cd07f756c9f917c76de422571cd06..701b5fabab51080aaf5a9d6446bf91796b62776b 100644 (file)
--- 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 5e05e77878d6480fee8413a9176961b92efc6abf..fdbbb410290c6183578b82726887eb238ae98a8c 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -457,7 +457,7 @@
           name: RELEASE
           description: |
             Release to generate release notes for.
-            Eg. 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 b5386641a5188aa0ccb02f403927091d3a2bd1f0..87bb4d38946641fb1264dc1c4555cfbc48194b05 100644 (file)
--- 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 (file)
index ca626e7..0000000
--- 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 (file)
index d8739cd..0000000
--- 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 c01bb803955feb5f62766dc4c4200f1ce21f4c27..dd1702ce53fd86e1ea92f218b4003a3ee3fa3003 100644 (file)
--- 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 f4de205fc69592254f2bd751d31b9b5dab95d10a..27919b3b72712acd185b83585fd42c0a8be9fc9a 100644 (file)
--- 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 54ae9d0b0ee86ec50e0848cfc1c536640728cc66..48ceac26891fe847851b0cfc67bfde7f59a0e63e 100644 (file)
--- 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 99f2e9ff8e36fe4772844ffe0c2b352713c4de44..7a7690dc4e58c962671135acce1324144f7e0ab6 100644 (file)
--- 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 b07fe93a6ee54b5dd7b97abafea71746c6689aaf..a6d4c08e2de92729ddf76f9b0f4630027163aa5c 100644 (file)
--- 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 60e34f63489c017196e3e2757087e15704982bda..263f84ebf1258befba6baa459db0ea3bc9844d94 100644 (file)
--- 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 9d7ba8d5fd41308c13bda53783401aa5d9ab2c5d..c9cb261e5f4797cb95a1135b7885cbefd2304887 100644 (file)
--- 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 7428dbd94a7e5f4800884e5f904d5237c62fa569..0d0a1c5ee8cc31fb833abdbbd1f2feb9c57404f9 100644 (file)
--- 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 437ec6f53398d38e2c5b0d28ee8d84e0f706c33d..0bef63d19183bd2d99564dc1ffcd7c11ce298772 100644 (file)
--- 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 7ca84904ff3741b2b9997d0871a52ff2b9a20c43..aba4cd92dd1196169eb0ffa904fdc83156c078a3 100644 (file)
--- 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 583e9d80ee83c0ead495018cc575ffca27265706..81010983f5dcf5ad93bfcfd20daf7d53915ec8ed 100644 (file)
--- 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 692ac7140fcfd5e05a280532511108d64807eacd..798162968fd409196d281e832d1dfd99b38a14da 100644 (file)
--- 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 3add89a18cefd6378da53b139658ba171a4620c5..e944d593463b443d3bc787dae4ed2fcae7dcd32a 100644 (file)
--- 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 01c8cdbee31a17e0187ca2b0a9eb874d19b5ce4f..008a44f48a10f8602bd367fd420b2a2c980dd538 100644 (file)
--- 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 92c6760b1492ab422751e1b613eade7bf79ff479..0158bf7ddd562841202e876c2e1d8729e9a7d088 100644 (file)
--- 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 930a5740c3f2af80bd2efa7f62c734e0861b2883..eb84962d3243bdd47a80f9b1d2f9e703840bb8ac 100644 (file)
--- 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 f0580134405d0e7c0ec90f067b7541833461c2c9..1dd93ce6a3200883a96f773197206d18727eb6b3 100644 (file)
--- 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 2857f799795feb110ea114e9a90dc2b33484d51a..2e3aa124f8226175da9db1885f6061ee3ea1f881 100644 (file)
--- 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 c7d3436e30a4cfaf66c06408b0a68b5b447b49bb..fb769e98da9de2ac47a3aa6a1c3b7cd42b3aa2f2 100644 (file)
--- 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 6edc22a3ac93f6ee4a19fa43e68eb54709d1a41c..73a137185559543243755007a0801f75d434496c 100644 (file)
--- 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 fdd81bb1a9cb1dfbeef6e5aab8db8186c2bcaa2d..9e2aac295d57a11497cc782c39bc787c9823b92c 100644 (file)
--- 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 9319983adbf318914fe20c91aa8799f0de243af4..1e307543d6b766e8399fc10ce3a3e42c260e4c1b 100644 (file)
--- 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 0570d3c64eada03946efb64a82d7936ff04b82db..b38c33961f58925390d34dd37e5a355a92b5266d 100644 (file)
--- 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 edffa352b8c620ffac22d746b4303ece6c5feea4..339e42d1ef428a6b053636c6a7ac72b173e39c24 100644 (file)
--- 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 54b241ec3d0a6724a3d5e5a375ef7e61fe29d6ef..bbfa29db9619e01c233658733c4ae6bac1cbed0f 100644 (file)
--- a/jjb/docs/docs_version_bump.sh
+++ b/jjb/docs/docs_version_bump.sh
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <RELEASE_NAME> <PUBLISH>"
     echo ""
-    echo "    RELEASE_NAME:  The RELEASE_NAME eg: 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 99099b9e1b2284b5fd65bf6ef83bafa40abb622c..e67989678d64d72ad6d9da0807a90c6e835c0f31 100644 (file)
--- a/jjb/docs/docs_version_bump_projects.sh
+++ b/jjb/docs/docs_version_bump_projects.sh
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <release_name> <PUBLISH>"
     echo ""
-    echo "    release_name:  The release_name e.g 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 (file)
index 07f041b..0000000
--- 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 5a40f97741b09fae58351bb22242117e0f181bd4..32830d9861c07f3e49961997c154eb2932887993 100644 (file)
--- 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 994684ceaf552ed414248659f6ce1c11e31fda1f..5c911eeee71943a8f90fbbd8902204343c3b3f7a 100644 (file)
--- 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 58ef5fcf161e1005362018e091b97e2332a67838..3be3001500211187e0be475490a90bbc68eee030 100644 (file)
--- 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 eecfc0d9d47552ed9595da108f45bee50a30e17e..bc480e680a20ab316c4adf1377d6af6e63b1f4a5 100644 (file)
--- 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 5c6ac54a5981f074014b0780eb9864a68f13811d..54bec093b948ab58c94f23f85a96b18ea41c775e 100644 (file)
--- 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 5fd05aae8d9c7310710a9b844fc321d18db4da96..46d9624aa6c9c76c39c9d256ba63e98cee98f553 100644 (file)
--- 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 7456efb43d4c1c97d14e45332801dd0c3965dc8c..33a89ae12bbf82e1dd3ad0ff7e941d5c0b647a0d 100644 (file)
--- 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 4afe5b45b29d1df48ce37820094d9da8747f2e66..1ae1b1d0067263c4f93ff2dc5b0e41d408927eb2 100644 (file)
--- 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 bb6b0fbfb20ec6cd92a0748c656797adf070ba4e..928ba580a02a973239f9abfb9c5f77b3182b6191 100644 (file)
--- 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 34d0428373b4c47c611aa43f1f36c8082ec46c13..8bb9c3ec71fecb4f720d93b257a39c00a0cc8e68 100644 (file)
--- 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 516ec6dfdf93041116d0ac9cdb74d2cc53dea1ae..ffd041a4907cbe3e0739b96633f559632c7eb7d0 100644 (file)
--- 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 c94994473f5173301166b15d973a3fc642c50cb9..2e94f42f1ebcefb2c465e1824bdce8ab14b615ca 100644 (file)
--- 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 68e9d842d3eb4cd3866c57eead9c1cd00bb5b1e2..eca792dcc77372f4d547ad5bc68ac144097ba701 100644 (file)
--- 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 2572e563585b47a2f11e4d74aed2ed77fcc8fbbd..4271ef1e992be8676450f37645e5d0da16f17c65 100644 (file)
--- 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 ec2fa8697c43908c9aba7d0f88b17e2f724c2491..e6bf86dbd277d9c23b714a350be7f5d8b78d7515 100644 (file)
--- 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 286ceee8870e34f8ed7566c84104914ed623850b..fe3124a3b7df30b5f77a8a6e26f220d0a8a14904 100644 (file)
--- 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 27c28e2a7d9ce32cd54d30770b649d81be3c186a..1d06f60052a79763c437d8c4e3144172fa64a028 100644 (file)
--- 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 1908193520c819eff19be59f57feb5a60b0263c0..c3ee4b8ef87de5ffc4d0d4d3e019a10cd7ddc8b3 100644 (file)
--- 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 c09a5938fc58eef5ca010a5baa51dce64be4d58f..d3e6dee93e3c59d35ca96fd16502d45481086600 100644 (file)
--- 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 64a5f2e437eb03ec95e5afa88539afa4d253041a..362c3e1f2ec8009ee511f2dad5bd6486895a81db 100644 (file)
--- 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 a24bae30ebaee33878a46a7eb7d3882df3353d6d..5e71e3bb74915d6c99d472d9e85f4cb8b2554f38 100644 (file)
--- 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 ba26e01622b25c8bf72ff6cfd46c3aed8c48d5e6..d175964bcfd4e8ea714d20c56fa3b8c6ba55a016 100644 (file)
--- 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 5bffe82a779efa9e3e03ea77b365a3bb38d9c0d9..3459916ecaa948723fb59ee68f79688cd217056c 100644 (file)
--- 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 731d65467003754b46f2b702a880ae5f1642f842..12a8219725b5de3474fa48c3bf9def23e25bdce9 100644 (file)
--- 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 5f2f1e29bbe287f1a4a7aafef0aed86b86e60843..9a802a4d171848f8fcec10107810411947153592 100644 (file)
--- 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 6bb490bac54352399f0369d2e91af260be579b52..ebc4c7ecc40f9f80eac09cbc83372f9853000161 100644 (file)
--- 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 162ea31b3f14c3f220cc46e68c80b28a4e35a58a..e0e5ffb2c25ba18ebc55ae4d67c7ea510c04b2ce 100644 (file)
--- 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 bb1acbdb812eb8c89ae587f0597d1814b5ad229a..70162dd484024c643da46ce708690a66dd56c5ec 100644 (file)
--- 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 a592224df92aed43cb6c5d52a0b980917f8b2dbc..bddbd9042f88f77dc258b531c7e61161d06c3ad6 100644 (file)
--- 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 57c13671db11aaaaceda02331f1f8a1558b5b940..ecf8664d09c60bf21ef320f4265ac36df46de87d 100644 (file)
--- 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 9d95315a303055bf811b702f9779a99bbf514f7e..30d0ed8ff2c8e4ebd9ba2c99cb40914baecf4579 100644 (file)
--- 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 6467534e576ef160c196f8538263193fc1121f6b..431bee124d240ac28b6be6094cdbd659fdc74a3e 100644 (file)
--- 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 f995f26e6fd215e556b73173f83707619351c141..d29645de470ab2d411a6ddc60f71cf7e0778c19e 100644 (file)
--- 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 41c97bfe88ae976079a495f1120e84b878eedc31..fe190bab1ce9686d3f9c35043dfabdc8a2e3cbb0 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -82,34 +82,6 @@
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-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 94f3906afd07c869f6acf2db141094896041bf50..40b89e991a5b2237766db141756f5509b174e525 100644 (file)
--- 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: