Merge "Prune SXP jobs"

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index c86a03abd13d80850740621610ee155792a7b041..ec51b9144a45bb3af87835a3067d60ca612906de 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -12,18 +12,9 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
index eb3101fd92e1279600c342e2eb85ed672a72e9dd..d6052bcef67418f27fa7ca424ad54d05367f1a6b 100644 (file)
--- a/jjb/sxp/sxp-csit-binding-origin.yaml
+++ b/jjb/sxp/sxp-csit-binding-origin.yaml
@@ -12,18 +12,9 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml
index 48f637f45c6378a6fdd5819e2275e497aa3f7d26..91651acaffce5845ad665e76e9411794ddee67e8 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-binding.yaml
+++ b/jjb/sxp/sxp-csit-cluster-binding.yaml
@@ -12,18 +12,9 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 1ddb45095d89b5fe98d8abdef2774da2a22f6485..45b3a37423b6de5a92561995c25e4f5f52370418 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,18 +12,9 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 3b85253e4b42f311388f818b1cb96ac184189bf1..4ab96d353ff7afd039e17c0d90c1e25858f27c2c 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -12,18 +12,9 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index 5d692f33d75ae7fd9911dd7fd7a4ddb94e2309d1..8f6ecaccdb5ab8de548b2947eea5f1b6de689e80 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -12,18 +12,9 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 19eadca362c988eb42c4d4f5ee659477879cf458..0c1a629239dcf9250fa68b53bfe68611ad3d4d98 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-sulfur
+    name: sxp-master
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -12,7 +12,7 @@
 
     java-version: "openjdk11"
 
-    stream: sulfur
+    stream: master
     project: "sxp"
     project-name: "sxp"
     branch: "master"
@@ -26,87 +26,6 @@
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
-- project:
-    name: sxp-phosphorus
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: sxp
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
-          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    java-version: "openjdk11"
-
-    stream: phosphorus
-    project: "sxp"
-    project-name: "sxp"
-    branch: "stable/phosphorus"
-
-    mvn-settings: "sxp-settings"
-    mvn-opts: "-Xmx1024m"
-
-    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
-- project:
-    name: sxp-silicon
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: sxp
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
-          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    java-version: "openjdk11"
-
-    stream: silicon
-    project: "sxp"
-    project-name: "sxp"
-    branch: "stable/silicon"
-
-    mvn-settings: "sxp-settings"
-    mvn-opts: "-Xmx1024m"
-
-    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
-- project:
-    name: sxp-aluminium
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: sxp
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
-          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    java-version: "openjdk11"
-
-    stream: aluminium
-    project: "sxp"
-    project-name: "sxp"
-    branch: "stable/aluminium"
-
-    mvn-settings: "sxp-settings"
-    mvn-opts: "-Xmx1024m"
-
-    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
 - project:
     name: sxp-release-management
     jobs: