Merge "Update validate-ar jobs for phosphorus"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index fee0354f49e4718e9f535256d00d6aeb7dca4702..634981da02a4a72f1d7a009f4f7e54fdec1cf7ca 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -15,7 +15,7 @@
     stream:
       - sulfur:
           branch: "master"
-          integration-test: phosphorus
+          integration-test: sulfur
       - phosphorus:
           branch: "stable/phosphorus"
           integration-test: phosphorus

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 08f38032d46f6c9d61ec43144d7bafb02aadefe8..c133627014e2bfa8dad9ef414bf98878f79ed0ed 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-silicon-rocky
+    name: netvirt-csit-hwvtep-openstack-integration-master-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"
@@ -48,12 +48,12 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-silicon-stein
+    name: netvirt-csit-hwvtep-openstack-integration-master-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index f99457a1faa7b742597c54f539daccb58d98d7ef..24b0e067dfe8b17c1395a2fa087dc2ac483d55c3 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -90,25 +90,17 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-upgrade-openstack-integration-stein-silicon
+    name: netvirt-csit-upgrade-openstack-integration-stein-master
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
 
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
 
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-
     testplan: "{project}-{topology}-openstack-upgrade.txt"
     odl-ml2-driver-version: "v2"
     enable-openstack-services: "placement-api,l2gw-plugin"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index f38f9f9fe24e31f511cd7ede4794b8ec3d4ca72f..8f24005bb42fa5a8c0e85155e4f1c9ce224ac7fa 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-silicon-rocky
+    name: netvirt-csit-openstack-integration-master-rocky
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -80,13 +80,13 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-openstack-integration-silicon-stein
+    name: netvirt-csit-openstack-integration-master-stein
     jobs:
       - inttest-csit-openstack-custom
     # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -323,7 +323,7 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-silicon
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-master
     jobs:
       - inttest-csit-openstack-custom
 
@@ -341,18 +341,10 @@
     os-cmp-cnt: 0
 
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
 
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-
     topology:
       - 1node:
           openstack_system2_count: 0

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 40e9cd764526ff44dc512a057569996bec1e427d..0f2916d2fcee208cde28d9683025a58e73860567 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -7,15 +7,9 @@
     project: "netvirt"
 
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           java-version: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"

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: