Merge "Feat!: Decommission log shipping on Nexus"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0ac80e5a3d97484f12bfffac22553f32a51bf3da..aa104f07c5f285b181edc97d9eff27967dc8d442 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,13 +4,13 @@ default_language_version:
   node: "14.13.0"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.0.1
     hooks:
       - id: check-json
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.2.1
+    rev: v2.4.1
     hooks:
       - id: prettier
         stages: [commit]
@@ -33,7 +33,7 @@ repos:
           )$
 
   - repo: https://github.com/ambv/black
-    rev: 21.6b0
+    rev: 21.9b0
     hooks:
       - id: black
 
@@ -56,7 +56,7 @@ repos:
       - id: pydocstyle
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.1
+    rev: v1.26.3
     hooks:
       - id: yamllint
 

diff --git a/INFO.yaml b/INFO.yaml
index 9dd031f7394b3075a008a5affc2649bd08119439..93c81d923e9de8482421871b8aa71faba7b61bd0 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -56,9 +56,9 @@ committers:
     timezone: "Unknown/Unknown"
   - name: "Robert Varga"
     email: "nite@hq.sk"
-    company: ""
+    company: "PANTHEON.tech"
     id: "rovarga"
-    timezone: "Unknown/Unknown"
+    timezone: "Europe/Bratislava"
   - name: "Thanh Ha"
     email: "zxiiro@gmail.com"
     id: "zxiiro"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index bd48444c8454bd322ae93b95939b44c5ffbf2c03..9b901c06aa53c1121598e80da78f7a7541871cb1 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -14,6 +14,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
 * ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
 * ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
+* ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 * ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896
@@ -31,6 +32,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200811-042113.395
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200813-042753.841
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20210608-222908.760
+* ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20211001-000220.740
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200101-010206.159
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200501-010133.750
@@ -38,6 +40,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200811-070703.256
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200813-035545.011
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20210401-010130.589
+* ZZCI - CentOS 7 - devstack-stein - x86_64 - 20211001-010151.446
 * ZZCI - CentOS 7 - docker - x86_64 - 20190924-232930.807
 * ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 * ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
@@ -48,6 +51,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - robot - x86_64 - 20191002-145719.577
 * ZZCI - CentOS 7 - robot - x86_64 - 20200812-002103.678
 * ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
+* ZZCI - CentOS 7 - robot - x86_64 - 20211001-132202.905
 * ZZCI - CentOS 8 - builder - x86_64 - 20200801-040136.580
 * ZZCI - CentOS 8 - builder - x86_64 - 20200811-042012.627
 * ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907

diff --git a/global-jjb b/global-jjb
index 09659ce65d005b15595a44bbef6304fd3cc83ac1..a86c6e8d376c95aa00b179fce9d207e61c8f72d0 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 09659ce65d005b15595a44bbef6304fd3cc83ac1
+Subproject commit a86c6e8d376c95aa00b179fce9d207e61c8f72d0

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
index 19d49cd8a0fa2adcb98e603007a5354973cc0cae..c1a63c527ccdd7e970a0447d849e09b498c2c3e4 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
index 5d47f67811751f7f39c41b92abfc84f8ec076846..7494a164791739dcc23ea13c51b6edc6d55ad938 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
index 6cf952749a52d5ca5a98444837450b03ad704880..0330422cf32f964744ed5483c6838639cfac2f75 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index 2c399aaeb645d400d8dff1c2e3445267cf143b53..b28a4ce97308c5c8fb411c217f25180abc4dc39e 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
index 92d3ff784a40aab15f8f7b165580ee752869f2ea..f47bcaea7ba6ea523419d9096bc313c8ff2ca081 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
index 3814e4e4c9efc56e55a1fa92fdafc5507ffc714a..c08eba6f2cd9ae9b00e2f17ff48e43f2e11bef72 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
index a4ef1dc75b15f2287e920d06c61a9cc49edf0450..fed4d5f8e7a60ed4f7d9dcb4b93b3f81f6787edb 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-1c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211006-065328.122
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
index 015ee25b9ba9a2f86fd81b33393b753cf3f42fc2..6bb60afefe3fd3e33a9a1826f840f3312cf296d5 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211006-065328.122
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
index 720049a94eef8dc195e6225239de42de85855e6c..c5b04993b396f6a5f8dbf282aabc3c5065cddda7 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211006-065328.122
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg
index 44ea9fbc5af2e5689e1b51265ae568098a4fe606..504a5734e0bf5b8760fcf2afa1d6767417dc4587 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211006-065328.122
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
index c78d1beaab7c516c30d0de858880bc3f033e5357..09cbdcf908efb9e9bb51caf495723109a8364407 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
@@ -1,4 +1,4 @@
 LABELS=centos7-robot-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20211001-132202.905
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=16

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
index b33cc895f6abf4fc49200eb23000218482d0f029..f0837d815ac324516d5293f2e842a5d002cd3b66 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
index 582d64324cba3a5e603f7c6ed209899649d17018..843f23edd4daf7f65981e7da542c73474390f002 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
index 77c6c0ec57e21d7b0747e5ed7e3f1188470cb905..f439e4e5dc2118e826e2d29c187de332ffc88fda 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
index 1ea7e05f8e0ae8f6e53e33d66e173c1f5457f730..d695b972d255d9e992fbf8d9dfb8a93953945926 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
index 5c82920a205c3d054fc9a76778b58d3a9be09850..3dbe92b19211b9d143cb5ec81738bf7ada17fe02 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index b21662f9b9d35cb8bc61f9d9e1fe717d8aac6d82..3836dd3395cb39c5c39d5825c42f64f5c5151bf4 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814
 HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
index 597ca06368c6998b94818b6be831f0e1a6476b1d..5ae5aaad600e67cf0637a43b664413bfbca01151 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
@@ -1,4 +1,4 @@
 LABELS=queue-disttest-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20211001-132202.905
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
index 457bd62ee3a8a1ea212785e2e60d8d620ed50d88..2f42a3c0e6e19bbd0f73c4870b3536d7ee697e3d 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
@@ -1,5 +1,5 @@
 LABELS=queue-intque-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20211001-132202.905
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 26e8409bf1823dbbf8adff90dd12524695a27481..47ea576f44095f625536871017655aabd76fbf2a 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,15 +13,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index ccdc972b1fcd5ff937a1c2eb23cf2251de7191aa..8917abc17b81bdb03a3eccdd30850bc4ceff3eb5 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -7,15 +7,15 @@
     project: "aaa"
 
     stream:
-      - phosphorus:
+      - sulfur:
           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"
 
     os-branch: "queens"
 

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 40eab4505338837c29fe363fd073bf2ce815b1cf..661b74e5b1c29448e16e6bc19417ab15dd2e3420 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -47,31 +47,6 @@
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
-- project:
-    name: aaa-aluminium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: aaa
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
-          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "aaa"
-    project-name: "aaa"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-
 - project:
     name: aaa-release-management
     jobs:

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 9d6fa5ed77e9354b10a10ddf44aad6178bde944e..fef79a6f7f6662b23cd72a75d1294db4bbed8351 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: archetypes-phosphorus
+    name: archetypes-sulfur
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: "archetypes"
     project-name: "archetypes"
     branch: "master"
@@ -18,15 +18,15 @@
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-silicon
+    name: archetypes-phosphorus
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "archetypes"
     project-name: "archetypes"
-    branch: "stable/silicon"
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "archetypes-settings"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
@@ -36,15 +36,15 @@
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-aluminium
+    name: archetypes-silicon
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "archetypes"
     project-name: "archetypes"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "archetypes-settings"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index ba922436475b3e34bc12f5f79b256376c97e729d..2099daf2b602e954fcab251e329f979b8a924096 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -13,15 +13,15 @@
       - gerrit-tox-verify
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+          integration-test: sulfur
+      - phosphorus:
+          branch: "stable/phosphorus"
           integration-test: phosphorus
       - silicon:
           branch: "stable/silicon"
           integration-test: silicon
-      - aluminium:
-          branch: "stable/aluminium"
-          integration-test: aluminium
 
     project: releng/autorelease
     project-name: autorelease

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index f8959dd2e4ac3ad7adc5f29badfe437e54959045..73071418c3f3338500caaae319ebefded3c40f6c 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. Aluminium-SR2, Silicon-SR1 ...
+            Eg. Silicon-SR1, Phosphorus-SR2 ...
     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 77ceb465934e9faf5ff2269c0ab223a337b2976c..bd9d0ae786de5658e01ed85dad9680650c7550f7 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -11,9 +11,9 @@
     build-node: centos7-builder-2c-8g
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"

diff --git a/jjb/autorelease/validate-autorelease-phosphorus.yaml b/jjb/autorelease/validate-autorelease-phosphorus.yaml
index 8c39f7ca52ed095840e8aeedbaa73c02dbc76261..ca626e745d38a96221f770d8836b6409fa4c6307 100644 (file)
--- a/jjb/autorelease/validate-autorelease-phosphorus.yaml
+++ b/jjb/autorelease/validate-autorelease-phosphorus.yaml
@@ -5,7 +5,7 @@
     jobs:
       - "{project-name}-validate-autorelease-{stream}"
     stream: phosphorus
-    branch: master
+    branch: stable/phosphorus
     project-name:
       - daexim:
           project: daexim
@@ -15,8 +15,6 @@
           project: jsonrpc
       - lispflowmapping:
           project: lispflowmapping
-      - neutron:
-          project: neutron
       - openflowplugin:
           project: openflowplugin
       - ovsdb:

diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-sulfur.yaml
similarity index 62%
rename from jjb/autorelease/validate-autorelease-aluminium.yaml
rename to jjb/autorelease/validate-autorelease-sulfur.yaml
index faed8ebbc9c1c896a4753dcef9852bbd1eee4c17..a620f12c88a64ee44243d675fd4b56b4dce1d3f9 100644 (file)
--- a/jjb/autorelease/validate-autorelease-aluminium.yaml
+++ b/jjb/autorelease/validate-autorelease-sulfur.yaml
@@ -1,32 +1,20 @@
 ---
 # Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
 - project:
-    name: autorelease-validate-aluminium
+    name: autorelease-validate-sulfur
     jobs:
       - "{project-name}-validate-autorelease-{stream}"
-    stream: aluminium
-    branch: stable/aluminium
+    stream: sulfur
+    branch: master
     project-name:
-      - aaa:
-          project: aaa
-      - bgpcep:
-          project: bgpcep
       - daexim:
           project: daexim
-      - genius:
-          project: genius
       - integration-distribution:
           project: integration/distribution
       - jsonrpc:
           project: jsonrpc
       - lispflowmapping:
           project: lispflowmapping
-      - netconf:
-          project: netconf
-      - netvirt:
-          project: netvirt
-      - neutron:
-          project: neutron
       - openflowplugin:
           project: openflowplugin
       - ovsdb:

diff --git a/jjb/autorelease/view-autorelease-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml
deleted file mode 100644 (file)
index 630ef68..0000000
--- a/jjb/autorelease/view-autorelease-aluminium.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
-- releng_view: &releng_autorelease_view_common_aluminium
-    name: releng-view-autorelease-aluminium
-    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-Aluminium
-    description: "List of Aluminium Merge jobs for Autorelease"
-    job-name:
-      - "aaa-maven-merge-aluminium"
-      - "bgpcep-maven-merge-aluminium"
-      - "daexim-maven-merge-aluminium"
-      - "genius-maven-merge-aluminium"
-      - "integration/distribution-maven-merge-aluminium"
-      - "jsonrpc-maven-merge-aluminium"
-      - "lispflowmapping-maven-merge-aluminium"
-      - "netconf-maven-merge-aluminium"
-      - "netvirt-maven-merge-aluminium"
-      - "neutron-maven-merge-aluminium"
-      - "openflowplugin-maven-merge-aluminium"
-      - "ovsdb-maven-merge-aluminium"
-      - "serviceutils-maven-merge-aluminium"
-    <<: *releng_autorelease_view_common_aluminium

diff --git a/jjb/autorelease/view-autorelease-phosphorus.yaml b/jjb/autorelease/view-autorelease-phosphorus.yaml
index ccc39e94507031eac29d41d813abcab23bea2858..d8739cd953787c841cc8a497f50edd01ed3452d4 100644 (file)
--- a/jjb/autorelease/view-autorelease-phosphorus.yaml
+++ b/jjb/autorelease/view-autorelease-phosphorus.yaml
@@ -26,7 +26,6 @@
       - "integration/distribution-maven-merge-phosphorus"
       - "jsonrpc-maven-merge-phosphorus"
       - "lispflowmapping-maven-merge-phosphorus"
-      - "neutron-maven-merge-phosphorus"
       - "openflowplugin-maven-merge-phosphorus"
       - "ovsdb-maven-merge-phosphorus"
       - "serviceutils-maven-merge-phosphorus"

diff --git a/jjb/autorelease/view-autorelease-sulfur.yaml b/jjb/autorelease/view-autorelease-sulfur.yaml
new file mode 100644 (file)
index 0000000..9330f92
--- /dev/null
+++ b/jjb/autorelease/view-autorelease-sulfur.yaml
@@ -0,0 +1,32 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_sulfur
+    name: releng-view-autorelease-sulfur
+    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-Sulfur
+    description: "List of Sulfur Merge jobs for Autorelease"
+    job-name:
+      - "daexim-maven-merge-sulfur"
+      - "integration/distribution-maven-merge-sulfur"
+      - "jsonrpc-maven-merge-sulfur"
+      - "lispflowmapping-maven-merge-sulfur"
+      - "openflowplugin-maven-merge-sulfur"
+      - "ovsdb-maven-merge-sulfur"
+      - "serviceutils-maven-merge-sulfur"
+    <<: *releng_autorelease_view_common_sulfur

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 8ec2890c58109ab895b1eeeb440fafd3659ded54..2f97fe8509952ca55f00c3b34026ac5ecdbfe4b1 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 0933d9a714f6e365c1c85721a3a90c4f340de76d..37851551e4d35700f8e8fe3559c83a23d889022b 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -13,15 +13,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 157b39c7539a6183994c4cf811b086b71e3e8b61..94ef8475e3fc02d979eb93fd153f7c1f8b431ed8 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index b9f3a84ca6655f945d2e6848fc32d549725d1351..ab916a36be4dc24c3cde36e15262d3da2f203bfa 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -11,19 +11,19 @@
     functionality: "bgpclustering-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index acc6bb7916f5cea6b410777380674dc9a15c81fd..deb75fafd62a0d5432ecbf56bb5c5b4c7f36ef08 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index a4edec8f233ff95485a9ea95bec5349acc23169e..a8ec64e00d809c2e08bebc295a12609b8809cb0d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index c65065868a0b39ca8e083498773214ee020f35b8..d34ffae527c56f0cf6fda49a23551deea81bc519 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index ce3dcf20760421097545bda98377a634ecdf02e8..e15aa935300d7e2ace9d520da63ecde0f9f39b2b 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -9,15 +9,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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"
 
     feature:
       - bgp:

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 2eeefc9367b12ba5e7181f0bfc11dbced601ce7f..560e8c1e0d8b9609808aa1b09490fd643d2fa2f6 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -60,37 +60,6 @@
     # Used by the release job
     staging-profile-id: 9427a05049030
 
-- project:
-    name: bgpcep-aluminium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: bgpcep
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
-          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "bgpcep"
-    project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "bgpcep-settings"
-    mvn-opts: "-Xmx2048m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      mdsal-merge-{stream}
-    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-    # Used by the release job
-    staging-profile-id: 9427a05049030
-
 - project:
     name: bgpcep-release-management
     jobs:

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 22da66b7347071a29928d66c69df74f36f5d48f9..92965a89a7c6e8fd9188ce983fdad85bbfcbff66 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -11,15 +11,15 @@
     functionality: "akka1"
 
     stream:
-      - phosphorus:
+      - sulfur:
           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/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index b48edc3179436d111dbcc1f95588b02cfa399b78..e3e9e9a27a1a2ac39b3bedccd64aa66a73d85531 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -12,15 +12,15 @@
     elasticsearch-attribute: "disabled"
 
     stream:
-      - phosphorus:
+      - sulfur:
           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/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 1cb0cec64737a12c43ac073799695097f9321bc7..784254de6ae9f70e603fc8d871b5ac108aa4e866 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -11,19 +11,19 @@
     functionality: "cs-chasing-leader-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 697a4d539448f9977661900ba9a61f680e4a316e..49f9c205f2de03cfe3d11a5800de9d596b22bbb9 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -11,19 +11,19 @@
     functionality: "cs-partnheal-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          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 d844c6970ede9d5d2e5ca89ca9e19191bde8d586..8dfe6fececc358fa190b2446ad2b1e8f289c3b01 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -11,19 +11,19 @@
     functionality: "ddb-expl-lead-movement-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 5f304f04258b7050516066f1bd0cfd936b7c9867..6265325aecc2d130c23ae35200381ba58acc1b2b 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -11,19 +11,19 @@
     functionality: "notifications-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index fb45b78326b6ac0a3978da37618923287cd11db5..8bf68eb9513231391d5d19c659dd1c2a37c6157f 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -11,19 +11,19 @@
     functionality: "drb-partnheal-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index e5ddddac8abd6f683e88f20866b81fd20e14f885..19484156336eb90239a2cea47c4a8271ca260ac0 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -11,19 +11,19 @@
     functionality: "drb-precedence-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 7b80ca4e340effa10d87d1d94653a747481c534d..daaef5d251214987aa1bd3ad62ba3aa9c58f2d41 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 4a175a06470e99a1f0ca7921b4783b8dc7d802d1..0b4444bd0db3fe970277216da85415b10883012b 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 3457c15449a14a4b1c6fa27d939ac9d6e9d43f14..c2858adcd3f316abcdbe5eb836975e057682e7f8 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index aceec9f93ed3e20aefca2c0dcfdbaae6b85584f0..5b52733069db4d6d38b66675a39d4b690c3383e9 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
index e7e367f392c525ef8eae289400ebb3e81282fa6b..3caa4d9d2c53e3e0547b5b15b9db0a637fe67474 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -7,15 +7,15 @@
     project: "controller"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           java-version: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          java-version: "openjdk11"
       - silicon:
           branch: "3.0.x"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "2.0.x"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 8297973dbbfc142e12993487c0dacad59386781d..a6b016cb2f2a94bbf71e7ca310b4f13600081b8b 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index c6b84dd2af20ed7ae3d78d2ef44d6adf22dfeafe..fd290fbe3b93a32116b8a2f380a0bf6b3bb58090 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 1e22f4cfcb6700737bfe59f248e47bdab2ba651b..377dab05cfa22cc5a03d1944f4c619ede499a64b 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: daexim-phosphorus
+    name: daexim-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -13,7 +13,7 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: phosphorus
+    stream: sulfur
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
@@ -25,7 +25,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-silicon
+    name: daexim-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -38,8 +38,8 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: silicon
-    branch: "stable/silicon"
+    stream: phosphorus
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"
@@ -50,7 +50,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-aluminium
+    name: daexim-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -63,8 +63,8 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: aluminium
-    branch: "stable/aluminium"
+    stream: silicon
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index b227f087c1f69d166bced9a6ba83d91b5d1a172d..c72d953826e2fd56a292177e7d41baad9306ab97 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -101,7 +101,7 @@
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
@@ -112,8 +112,8 @@
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210608-222826.097"
-    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20210401-010130.589"
-    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20210608-222908.760"
+    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20211001-010151.446"
+    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20211001-000220.740"
     openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207"
 
     # Default Robot framework options
@@ -125,11 +125,11 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/aluminium
+    verify-branch: stable/silicon
     # Value for ODL_STREAM
-    verify-stream: aluminium
+    verify-stream: silicon
     verify-karaf-version: karaf4
-    verify-jdkversion: openjdk8
+    verify-jdkversion: openjdk11
 
     # Maven / Java
     java-version: "openjdk8"
@@ -232,23 +232,9 @@
       netconf-csit-3node-clustering-only-silicon,
       netconf-csit-3node-clustering-scale-only-silicon,
       yangtools-csit-1node-system-only-silicon
-    csit-mri-list-aluminium: >
-      controller-csit-1node-akka1-all-aluminium,
-      controller-csit-1node-benchmark-all-aluminium,
-      controller-csit-1node-rest-cars-perf-all-aluminium,
-      controller-csit-3node-benchmark-all-aluminium,
-      controller-csit-3node-clustering-ask-all-aluminium,
-      controller-csit-3node-clustering-tell-all-aluminium,
-      controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
-      controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
-      mdsal-csit-3node-netty-replicate-only-aluminium,
-      yangtools-csit-1node-system-only-aluminium
     csit-sanity-list-silicon: >
       openflowplugin-csit-1node-sanity-only-silicon,
       distribution-sanity-silicon
-    csit-sanity-list-aluminium: >
-      openflowplugin-csit-1node-sanity-only-aluminium,
-      distribution-sanity-aluminium
     csit-weekly-list-silicon: >
       controller-csit-1node-notifications-longevity-only-silicon,
       controller-csit-3node-drb-partnheal-longevity-only-silicon,
@@ -258,15 +244,6 @@
       distribution-deploy-silicon,
       distribution-offline-silicon,
       openflowplugin-csit-1node-longevity-only-silicon
-    csit-weekly-list-aluminium: >
-      controller-csit-1node-notifications-longevity-only-aluminium,
-      controller-csit-3node-drb-partnheal-longevity-only-aluminium,
-      controller-csit-3node-drb-precedence-longevity-only-aluminium,
-      controller-csit-3node-ddb-expl-lead-movement-longevity-only-aluminium,
-      bgpcep-csit-3node-bgpclustering-longevity-only-aluminium,
-      distribution-deploy-aluminium,
-      distribution-offline-aluminium,
-      openflowplugin-csit-1node-longevity-only-aluminium
     csit-mri-list-phosphorus: >
       aaa-csit-1node-authn-all-phosphorus,
       controller-csit-1node-akka1-all-phosphorus,
@@ -298,3 +275,24 @@
     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, controller-csit-1node-rest-cars-perf-all-sulfur,
+      controller-csit-3node-benchmark-all-sulfur,
+      controller-csit-3node-clustering-ask-all-sulfur, controller-csit-3node-clustering-tell-all-sulfur,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-sulfur,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-sulfur,
+      mdsal-csit-3node-netty-replicate-only-sulfur, 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-sulfur
+    csit-weekly-list-sulfur: >
+      controller-csit-1node-notifications-longevity-only-sulfur,
+      controller-csit-3node-drb-partnheal-longevity-only-sulfur,
+      controller-csit-3node-drb-precedence-longevity-only-sulfur,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-sulfur,
+      bgpcep-csit-3node-bgpclustering-longevity-only-sulfur, distribution-deploy-sulfur,
+      distribution-offline-sulfur, openflowplugin-csit-1node-longevity-only-sulfur
+    csit-sanity-list-sulfur: >
+      openflowplugin-csit-1node-sanity-only-sulfur, distribution-sanity-sulfur

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 0050f6a4240485dda65324ea94ed9bd057dd6cf0..4f736eebbac293b66ae0ae764f6ba5872a3c2976 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index b246d2cfc1ce759451347df39a5a04b4ec466480..56c4ad9ac524967a1d4bd6abb0361eb2efd87452 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -6,12 +6,12 @@
       - gerrit-tox-verify
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     project: docs
     project-name: docs

diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml
index b700ec0ea70103b48ecec39db5f99ef541aa68d2..d0d42157bed6958e07e82b65482329bb5937cce2 100644 (file)
--- a/jjb/docs/docs-template.yaml
+++ b/jjb/docs/docs-template.yaml
@@ -29,7 +29,7 @@
           lftools-version: "{lftools-version}"
       - string:
           name: RELEASE_NAME
-          description: "The next release name eg: Aluminium, Silicon."
+          description: "The next release name eg: Silicon, Phosphorus."
       - bool:
           name: PUBLISH
           default: false

diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh
index 50bc1c9e3e43411b54d66c682869ee1f87102f67..fd9b06586644c99e1c26bdd74181d1364757f5fc 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: Aluminium, Silicon."
+    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Silicon, Phosphorus."
     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 defda6d63112ec4290c05f43bb97e07a5462ce4c..b92a648082b9ea0fb6f2dd7996015e6b0d721a5e 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 Aluminium, Silicon."
+    echo "    release_name:  The release_name e.g Silicon, Phosphorus."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 4eac39299bfa15d111859c214cbab53462c9b8a9..833637361d14249e6f32c96e67e7826472539ae9 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -19,9 +19,6 @@
       - master:
           branch: "master"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 54e2cb182bf31f8d038a9d7f14fee2e8fe532024..6e3f8f552081df35e7a50afe94fd1e7e51fe9f79 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -10,9 +10,6 @@
       - master:
           branch: "master"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "rocky"
 

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index ea5d8dc85b7b91aa4af03f4c0fb5c764c7f2e228..ee4fad157806f9ccf9831d7d6f82d1e8047041aa 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -32,41 +32,6 @@
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
-- project:
-    name: genius-aluminium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: genius
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
-          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "genius"
-    project-name: "genius"
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
-    java-version: "openjdk11"
-    mvn-settings: "genius-settings"
-    mvn-opts: "-Xmx1024m"
-    build-timeout: 90
-    dependencies: >
-      controller-merge-{stream},
-      yangtools-merge-{stream},
-      odlparent-merge-{stream},
-      openflowplugin-merge-{stream},
-      neutron-merge-{stream}
-    email-upstream:
-      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
-      \ [neutron]"
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
-
 - project:
     name: genius-sonar
     jobs:

diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
index b459c7f0db9b35edea4b79bba920d93a0b630e73..0a80ac274afdda3563bd00d83a5a5a365c0b621a 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -7,15 +7,15 @@
     project: "infrautils"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index bdfede3dd9956a023ccfa91ebd9d2b0444539ef1..91391ce82e604f3c260546d1a2b2caa86d4d0b74 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -24,7 +24,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-1.9.x
+    name: infrautils-2.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -35,10 +35,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: 1.9.x
+    stream: 2.0.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "1.9.x"
+    branch: "2.0.x"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
     dependencies: "odlparent-merge-{stream}"
@@ -48,7 +48,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-1.8.x
+    name: infrautils-1.9.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -59,13 +59,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 1.9.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "1.8.x"
+    branch: "1.9.x"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 

diff --git a/jjb/integration/csit-jobs-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst
deleted file mode 100644 (file)
index f4ca504..0000000
--- a/jjb/integration/csit-jobs-aluminium.lst
+++ /dev/null
@@ -1,54 +0,0 @@
-aaa-csit-1node-authn-all-aluminium,
-bgpcep-csit-1node-bgp-ingest-all-aluminium,
-bgpcep-csit-1node-bgp-ingest-mixed-all-aluminium,
-bgpcep-csit-1node-throughpcep-all-aluminium,
-bgpcep-csit-1node-userfeatures-all-aluminium,
-daexim-csit-1node-basic-only-aluminium,
-daexim-csit-3node-clustering-basic-only-aluminium,
-distribution-csit-1node-userfeatures-all-aluminium,
-distribution-csit-managed-aluminium,
-genius-csit-1node-upstream-only-aluminium,
-genius-csit-3node-upstream-only-aluminium,
-jsonrpc-csit-1node-basic-only-aluminium,
-netconf-csit-1node-callhome-only-aluminium,
-netconf-csit-1node-scale-max-devices-only-aluminium,
-netconf-csit-1node-scale-only-aluminium,
-netconf-csit-1node-userfeatures-all-aluminium,
-netconf-csit-1node-userfeatures-rfc8040-all-aluminium,
-netconf-csit-3node-clustering-only-aluminium,
-netconf-csit-3node-clustering-scale-only-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-odltools-csit-1node-upstream-all-aluminium,
-openflowplugin-csit-1node-cbench-only-aluminium,
-openflowplugin-csit-1node-flow-services-all-aluminium,
-openflowplugin-csit-1node-perf-bulkomatic-only-aluminium,
-openflowplugin-csit-1node-perf-stats-collection-only-aluminium,
-openflowplugin-csit-1node-scale-link-only-aluminium,
-openflowplugin-csit-1node-scale-only-aluminium,
-openflowplugin-csit-1node-scale-switch-only-aluminium,
-openflowplugin-csit-3node-clustering-bulkomatic-only-aluminium,
-openflowplugin-csit-3node-clustering-only-aluminium,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-aluminium,
-ovsdb-csit-1node-upstream-southbound-all-aluminium,
-ovsdb-csit-3node-upstream-clustering-only-aluminium,

diff --git a/jjb/integration/csit-jobs-sulfur.lst b/jjb/integration/csit-jobs-sulfur.lst
new file mode 100644 (file)
index 0000000..1bbb9d8
--- /dev/null
+++ b/jjb/integration/csit-jobs-sulfur.lst
@@ -0,0 +1,21 @@
+bgpcep-csit-1node-bgp-ingest-all-sulfur,
+bgpcep-csit-1node-bgp-ingest-mixed-all-sulfur,
+bgpcep-csit-1node-throughpcep-all-sulfur,
+bgpcep-csit-1node-userfeatures-all-sulfur,
+daexim-csit-1node-basic-only-sulfur,
+daexim-csit-3node-clustering-basic-only-sulfur,
+distribution-csit-managed-sulfur,
+jsonrpc-csit-1node-basic-only-sulfur,
+odltools-csit-1node-upstream-all-sulfur,
+openflowplugin-csit-1node-cbench-only-sulfur,
+openflowplugin-csit-1node-flow-services-all-sulfur,
+openflowplugin-csit-1node-perf-bulkomatic-only-sulfur,
+openflowplugin-csit-1node-perf-stats-collection-only-sulfur,
+openflowplugin-csit-1node-scale-link-only-sulfur,
+openflowplugin-csit-1node-scale-only-sulfur,
+openflowplugin-csit-1node-scale-switch-only-sulfur,
+openflowplugin-csit-3node-clustering-bulkomatic-only-sulfur,
+openflowplugin-csit-3node-clustering-only-sulfur,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-sulfur,
+ovsdb-csit-1node-upstream-southbound-all-sulfur,
+ovsdb-csit-3node-upstream-clustering-only-sulfur,

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 459ccb73a0bc900b8777579afc37c3adfec0b31c..8a7d036f9fdc064e0137c7f730efc76b9e651283 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -15,9 +15,6 @@
       - silicon:
           branch: "master"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 42be4bd8a1ee46ee140c320f55332c89b6ced2a6..37083f18b99e383d728736a4725ac23778299e25 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -24,12 +24,12 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
 - project:
     name: distribution-managed
@@ -55,7 +55,7 @@
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           dependencies: >
             bgpcep-maven-merge-{stream},
@@ -67,8 +67,8 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           dependencies: >
             bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
@@ -79,17 +79,14 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           dependencies: >
-            aaa-maven-merge-{stream},
             bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
-            genius-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
             netconf-maven-merge-{stream},
-            netvirt-maven-merge-{stream}
             neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
@@ -116,16 +113,16 @@
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           dependencies: >
             distribution-merge-managed-{stream},
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           dependencies: >
             distribution-merge-managed-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           dependencies: >
             distribution-merge-managed-{stream},
 
@@ -148,12 +145,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - phospshorus:
+      - sulfur:
           branch: "master"
+      - phospshorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
 - project:
     name: distribution-sonar

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 81e19b4a9188698fd3830f444c790129545c4deb..e787fdef66bcbc233b89cfdccf67f6012e1bf3f5 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -885,7 +885,7 @@
 
     docker_system_count: "1"
     docker_system_flavor: "v3-standard-2"
-    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20211006-065328.122"
 
     #####################
     # Job Configuration #

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0baa6db296b3f2f4311378433ec67f71c72c9c6e..57d1c586eb8c53e5d78d5b03f0e852c41ae543fb 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -19,34 +19,34 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           mvn-version: "mvn35"
           java-version: "openjdk11"
-          csit-list: !include: csit-jobs-phosphorus.lst
+          csit-list: !include: csit-jobs-sulfur.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
             daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
             bgpcep integration/distribution
 
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           mvn-version: "mvn35"
           java-version: "openjdk11"
-          csit-list: !include: csit-jobs-silicon.lst
+          csit-list: !include: csit-jobs-phosphorus.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
             daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
             bgpcep integration/distribution
 
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           mvn-version: "mvn35"
           java-version: "openjdk11"
-          csit-list: !include: csit-jobs-aluminium.lst
+          csit-list: !include: csit-jobs-silicon.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
             bgpcep integration/distribution
 
 - project:
@@ -61,8 +61,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+          csit-blocklist: >
+            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
+            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc 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-sulfur.lst
+          csit-mri-list: "{csit-mri-list-sulfur}"
+          csit-weekly-list: "{csit-weekly-list-sulfur}"
+      - phosphorus:
+          branch: "stable/phosphorus"
           csit-blocklist: >
             aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
             netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
@@ -87,22 +100,6 @@
           csit-list: !include: csit-jobs-silicon.lst
           csit-mri-list: "{csit-mri-list-silicon}"
           csit-weekly-list: "{csit-weekly-list-silicon}"
-      - aluminium:
-          branch: "stable/aluminium"
-          csit-blocklist: >
-            bier controller dluxapps lispflowmapping l2switch mdsal nemo
-            odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
-            gate longevity sanity tdd tempest wip
-            bgpcep-csit-3node-bgpclustering-all
-            bgpcep-csit-3node-bgpclustering-ha-only
-            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
-            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
-            netvirt-csit-3node-1cmb
-            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-aluminium.lst
-          csit-mri-list: "{csit-mri-list-aluminium}"
-          csit-weekly-list: "{csit-weekly-list-aluminium}"
 
 - project:
     name: integration-sanity
@@ -112,18 +109,18 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-sulfur}"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-phosphorus}"
       - silicon:
           branch: "stable/silicon"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-silicon}"
-      - aluminium:
-          branch: "stable/aluminium"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-aluminium}"
 
 - job-template:
     name: "integration-merge-dashboard"
@@ -167,7 +164,7 @@
             - file-id: odl-elastic-cloud
               target: "$HOME/.netrc"
       - integration-install-robotframework
-        # yamllint disable-line rule:line-length
+      # yamllint disable-line rule:line-length
       - shell: python3 $WORKSPACE/test/csit/scripts/push_dashboard.py a4ff38b99ef2c7626450543021b4c134.us-east-1.aws.found.io:9243
 
     publishers:

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index b494f0d131728ddbec5f41b232266d438295c852..697fccb9346db175174e704874f98fc2daeca440 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 11ba9beaf0eb615d5e8fbf330160f04672512e71..39aec0c4f71385ae3edf11d8bb6ac266366b9e28 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: jsonrpc-phosphorus
+    name: jsonrpc-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -13,7 +13,7 @@
 
     project: "jsonrpc"
     project-name: "jsonrpc"
-    stream: phosphorus
+    stream: sulfur
     java-version: "openjdk11"
     branch: "master"
     mvn-settings: "jsonrpc-settings"
@@ -25,7 +25,7 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-silicon
+    name: jsonrpc-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -38,9 +38,9 @@
 
     project: "jsonrpc"
     project-name: "jsonrpc"
-    stream: silicon
+    stream: phosphorus
     java-version: "openjdk11"
-    branch: "stable/silicon"
+    branch: "stable/phosphorus"
     mvn-settings: "jsonrpc-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
@@ -50,7 +50,7 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-aluminium
+    name: jsonrpc-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -63,9 +63,9 @@
 
     project: "jsonrpc"
     project-name: "jsonrpc"
-    stream: aluminium
+    stream: silicon
     java-version: "openjdk11"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     mvn-settings: "jsonrpc-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index f68f89b84953f535bbdbd05501253f1db693c664..916f0494d6c7e40520d2db781de98f429a1042cb 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -13,15 +13,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index b0a9d4f8a24b80e15d3c2ee0157540a82e5832d9..4d7482a3c203bedef14d3120f33575974e8b3488 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -13,15 +13,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 58003f09b7e39b39ade56134c2e6c922934824af..6ed3621c7af55e6bbdee24b0821065db2ae96903 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index fa7e6d74b3bb6d792fbe549698105aa56161737e..4d8313801c30681ebcc1d26be9a8320c7518592c 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -10,15 +10,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     os-branch: "queens"
 

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 35c5ce585336d7c2eb71021873b1f7d6c5543523..7b40eea2fd659209049e239b97f000e279eeb73d 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 6d36a960246949041f103f88b3017a6dfe150d6d..21d89fbe3c180e50c2de706d5b7b663722707394 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: lispflowmapping-phosphorus
+    name: lispflowmapping-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -12,7 +12,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: "lispflowmapping"
     project-name: "lispflowmapping"
     branch: "master"
@@ -32,7 +32,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-silicon
+    name: lispflowmapping-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -44,10 +44,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "stable/silicon"
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "lispflowmapping-settings"
     mvn-goals: "clean deploy -DrepoBuild"
@@ -64,7 +64,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-aluminium
+    name: lispflowmapping-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -76,10 +76,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "lispflowmapping-settings"
     mvn-goals: "clean deploy -DrepoBuild"

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 54f92b6544889718d7eba555caeffcdca698bc1d..d0a5a4dbddaeb91ae27e3c7674a21bbc9e2191ab 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -12,15 +12,15 @@
     functionality: "bindingv1"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
index a20e4bd3a737202a45fb9dec1ce10fd491b8eaf0..4574617725fdab30a983ff5c8e1bd5309ece3c08 100644 (file)
--- a/jjb/mdsal/mdsal-csit-netty-replication.yaml
+++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           install-features: >
@@ -21,17 +21,17 @@
             odl-restconf-nb-bierman02,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           jre: "openjdk11"
           install-features: >
             features-controller,
-            odl-mdsal-exp-replicate-netty,
+            odl-mdsal-replicate-netty,
             odl-restconf-nb-bierman02,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           jre: "openjdk11"
           install-features: >
             features-controller,

diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
index 49838f97e270eb1a1ade27cb107948df4b5fc23e..b405266f1459f7671b59086d235875605d57397a 100644 (file)
--- a/jjb/mdsal/mdsal-patch-test.yaml
+++ b/jjb/mdsal/mdsal-patch-test.yaml
@@ -7,15 +7,15 @@
     project: "mdsal"
 
     stream:
-      - phosphorus:
+      - sulfur:
           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"
 
     os-branch: "queens"
 

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 49e5a8164240c4391b741c3ef1aa59f5e12cd3a2..aa4f502dc1d4c3551b742d0cb9f6115f5ae9cd20 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -18,9 +18,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index cdc0e1a057cf45fa88243408423e565e5ce75355..2c2fd9bbcd9a88ac741c7ccecc344424feaf8ded 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -18,9 +18,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 7f3dd75afb5629366947a273bbc572677c1b1091..952e03c8fd26f910c86d24ecc7ae75515ed93d26 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -20,9 +20,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-distribution-mri-test.yaml b/jjb/netconf/netconf-distribution-mri-test.yaml
index de768e63f25a5cce90594b49bc6b6ba376ad62ca..016cf13c1a58e865ad17dad919cd2732b94e30fb 100644 (file)
--- a/jjb/netconf/netconf-distribution-mri-test.yaml
+++ b/jjb/netconf/netconf-distribution-mri-test.yaml
@@ -13,9 +13,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index 5dbe246fa194724e6fcd63053bf567d439f02f85..1b8bdc6489e93e08eaa153a6ff58e549d4611e5f 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -13,9 +13,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index a08f3c28870fe91b608d07d72bc894a1b6ef9c57..84eede89ae0122597c6532d0e5176ad1e0763cab 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -18,9 +18,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
@@ -54,22 +51,22 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
             \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           jre: "openjdk11"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
             \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           jre: "openjdk11"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 1bf4193a7c4fe964859ffc8ff0217499c381e65f..d8bfeb02f3e0520564a0856804b3184f4448a50c 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index e4f7cab67065116e5854fa7e7753d2e5f89fab98..db43ae95cbfe57d76e4cc2179b73f688909f2d7a 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -53,34 +53,6 @@
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
-- project:
-    name: netconf-aluminium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: netconf
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
-          rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "netconf"
-    project-name: "netconf"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    karaf-version: "netconf"
-    mvn-settings: "netconf-settings"
-    mvn-goals: "clean deploy -Pintegrationtests"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
-    build-timeout: 90
-    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
 - project:
     name: netconf-1.7.4.x
     jobs:

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 08f38032d46f6c9d61ec43144d7bafb02aadefe8..7da5ac97e6a428e38170e4303edd74ffa04b6aad 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"
@@ -95,52 +95,3 @@
           odl-ml2-port-binding: "pseudo-agentdb-binding"
           openstack_system_image: "{openstack_stein_system_image}"
           openstack_system2_image: "{openstack_stein_system_image}"
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    jre: "openjdk11"
-    testplan: "{project}-{topology}-l2gw-openstack.txt"
-    odl-ml2-driver-version: "v2"
-    enable-openstack-services: "placement-api,l2gw-plugin"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    odl_system_flavor: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    tools_system_count: 2
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: "yes"
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: "yes"
-          install-features: "odl-jolokia,odl-netvirt-openstack"
-
-    functionality:
-      - upstream-stateful
-      - gate-stateful
-
-    openstack:
-      - stein:
-          openstack-branch: "stable/stein"
-          odl-ml2-branch: "stable/stein"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_stein_system_image}"
-          openstack_system2_image: "{openstack_stein_system_image}"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
deleted file mode 100644 (file)
index 9a50648..0000000
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
----
-- project:
-    name: netvirt-csit-upgrade-openstack-integration-rocky-aluminium
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: "netvirt"
-
-    stream:
-      - aluminium:
-          branch: "master"
-          jre: "openjdk11"
-
-    testplan: "{project}-{topology}-openstack-upgrade.txt"
-    odl-ml2-driver-version: "v2"
-    enable-openstack-services: "placement-api,l2gw-plugin"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    group-add-mod-enabled: "true"
-    odl_system_flavor: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-
-    functionality:
-      - upgrade
-      - upgrade-snat-conntrack:
-          odl-snat-mode: "conntrack"
-
-    openstack:
-      - rocky:
-          openstack-branch: "stable/rocky"
-          odl-ml2-branch: "stable/rocky"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_rocky_system_image}"
-          openstack_system2_image: "{openstack_rocky_system_image}"
-
-- project:
-    name: netvirt-csit-upgrade-openstack-integration-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: "netvirt"
-
-    stream:
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-
-    testplan: "{project}-{topology}-openstack-upgrade.txt"
-    odl-ml2-driver-version: "v2"
-    enable-openstack-services: "placement-api,l2gw-plugin"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    group-add-mod-enabled: "true"
-    odl_system_flavor: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-
-    functionality:
-      - upgrade
-      - upgrade-snat-conntrack:
-          odl-snat-mode: "conntrack"
-
-    openstack:
-      - stein:
-          openstack-branch: "stable/stein"
-          odl-ml2-branch: "stable/stein"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_stein_system_image}"
-          openstack_system2_image: "{openstack_stein_system_image}"
-
-- project:
-    name: netvirt-csit-upgrade-openstack-integration-stein-silicon
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: "netvirt"
-
-    stream:
-      - phosphorus:
-          branch: "master"
-          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"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    group-add-mod-enabled: "true"
-    odl_system_flavor: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-
-    functionality:
-      - upgrade
-      - upgrade-snat-conntrack:
-          odl-snat-mode: "conntrack"
-
-    openstack:
-      - stein:
-          openstack-branch: "stable/stein"
-          odl-ml2-branch: "stable/stein"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_stein_system_image}"
-          openstack_system2_image: "{openstack_stein_system_image}"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 3e79e321f4d9bc37a1cc5edbcdcfccbbe1a82bca..461b078955e2aef09e171f3b1787f9fb8fabb34b 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"
@@ -51,7 +51,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -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
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -132,7 +132,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -161,173 +161,11 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-openstack-integration-aluminium-rocky
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-master
     jobs:
       - inttest-csit-openstack-custom
 
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    jre: "openjdk11"
-    testplan: "{project}-{topology}-openstack.txt"
-    odl-ml2-driver-version: "v2"
-    enable-openstack-services: "placement-api,tempest"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-standard-4
-    tools_system_count: 0
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-          robot-options: "-v FAIL_ON_EXCEPTIONS:True"
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: "yes"
-          install-features: "odl-jolokia,odl-netvirt-openstack"
-
-    functionality:
-      - upstream-stateful
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-      - gate-minimal-cluster:
-          testplan: "{project}-{topology}-minimal-openstack.txt"
-      - dcgw:
-          testplan: "{project}-{topology}-dcgw-openstack.txt"
-          tools_system_count: 3
-          enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
-          tools_system_count: 3
-          enable-gre-type-driver: "yes"
-      - tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-      - gate-tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-      - gate-tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-
-    openstack:
-      - rocky:
-          openstack-branch: "stable/rocky"
-          odl-ml2-branch: "stable/rocky"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_rocky_system_image}"
-          openstack_system2_image: "{openstack_rocky_system_image}"
-
-- project:
-    name: netvirt-csit-openstack-integration-aluminium-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    #temporarily disabling Stein jobs
-    disable-job: true
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    jre: "openjdk11"
-    testplan: "{project}-{topology}-openstack.txt"
-    odl-ml2-driver-version: "v2"
-    enable-openstack-services: "placement-api,tempest"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    tools_system_count: 0
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-          robot-options: "-v FAIL_ON_EXCEPTIONS:True"
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: "yes"
-          install-features: "odl-jolokia,odl-netvirt-openstack"
-
-    functionality:
-      - upstream-stateful
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-      - gate-minimal-cluster:
-          testplan: "{project}-{topology}-minimal-openstack.txt"
-      - dcgw:
-          testplan: "{project}-{topology}-dcgw-openstack.txt"
-          tools_system_count: 3
-          enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
-          tools_system_count: 3
-          enable-gre-type-driver: "yes"
-      - tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-      - gate-tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-      - gate-tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-
-    openstack:
-      - stein:
-          openstack-branch: "stable/stein"
-          odl-ml2-branch: "stable/stein"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_stein_system_image}"
-          openstack_system2_image: "{openstack_stein_system_image}"
-
-- project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-silicon
-    jobs:
-      - inttest-csit-openstack-custom
-
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
@@ -341,14 +179,10 @@
     os-cmp-cnt: 0
 
     stream:
-      - phosphorus:
+      - master:
           branch: "master"
           jre: "openjdk11"
 
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-
     topology:
       - 1node:
           openstack_system2_count: 0
@@ -379,7 +213,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
       - tempest-stateful:

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 7df76be2bf6d8f69622b93b7112d0173bcfc889d..562b3e069fcc814a2d699c9cb7528ae581fd0fce 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -37,45 +37,6 @@
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
-- project:
-    name: netvirt-aluminium
-    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: netvirt
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
-          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
-      - gerrit-tox-verify
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    branch: "stable/aluminium"
-
-    project: "netvirt"
-    project-name: "netvirt"
-
-    java-version: "openjdk11"
-    mvn-settings: "netvirt-settings"
-    mvn-opts: "-Xmx2048m"
-    build-timeout: 90
-    build-node: centos7-builder-8c-8g
-    dependencies: >
-      genius-merge-{stream},
-      neutron-merge-{stream},
-      openflowjava-merge-{stream},
-      openflowplugin-merge-{stream},
-      ovsdb-merge-{stream}
-    email-upstream:
-      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
-      \ [ovsdb]"
-
-    # Used by the release job
-    staging-profile-id: a67da0ffbb1ba
-
 - project:
     name: netvirt-sonar
     jobs:

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
index d4de8d2b8cac4fb1789ea9f27cf766d07b3b56ce..57df5370a9168122878eb81de7cb14a518b118bc 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -7,12 +7,12 @@
     project: "neutron"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     os-branch: "queens"
 

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 9c80a472e7de93d3e684c80fa724b5060ef0aabb..6f5e657ce32c7884eda44cc06be46dced960f2e6 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,13 +1,12 @@
 ---
 - project:
-    name: neutron-phosphorus
+    name: neutron-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: master
     project: "neutron"
     project-name: "neutron"
     build-timeout: 90
@@ -15,7 +14,6 @@
     java-version: "openjdk11"
     mvn-settings: "neutron-settings"
     mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
     email-upstream: "[neutron] [odlparent] [aaa]"
 
     # Used by the release job
@@ -43,28 +41,6 @@
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-aluminium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "neutron"
-    project-name: "neutron"
-    build-timeout: 90
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "neutron-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
-    email-upstream: "[neutron] [odlparent] [aaa]"
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
 - project:
     name: neutron-sonar
     jobs:

diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml
index a5ff2f7316f0390f053e5ca0ae8551ad85ffaaaf..505a3947d3f2300d85a5ce0f90f3788ef73c3d4f 100644 (file)
--- a/jjb/odlmicro/odlmicro-csit.yaml
+++ b/jjb/odlmicro/odlmicro-csit.yaml
@@ -13,7 +13,7 @@
 
     # Project branches.
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf"
@@ -21,22 +21,22 @@
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
             -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           jre: "openjdk11"
           functionality: "netconf"
           robot-options: >
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
             -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           jre: "openjdk11"
           functionality: "netconf"
           robot-options: >
             -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.9.2-SNAPSHOT
+            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
 
     install:
       - manual:
@@ -59,7 +59,7 @@
 
       # Project branches.
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf-devices-scale"
@@ -71,8 +71,8 @@
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           jre: "openjdk11"
           functionality: "netconf-devices-scale"
           robot-options: >
@@ -83,17 +83,17 @@
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           jre: "openjdk11"
           functionality: "netconf-devices-scale"
           robot-options: >
             -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.9.2-SNAPSHOT
+            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
             -v USE_NETCONF_CONNECTOR:False
             -v SCHEMA_MODEL:juniper
-            -v INIT_DEVICE_COUNT:5000
+            -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
     install:
       - manual:
@@ -125,7 +125,7 @@
 
       # Project branches.
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf-general-scale"
@@ -137,8 +137,8 @@
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           jre: "openjdk11"
           functionality: "netconf-general-scale"
           robot-options: >
@@ -149,17 +149,17 @@
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           jre: "openjdk11"
           functionality: "netconf-general-scale"
           robot-options: >
             -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.9.2-SNAPSHOT
+            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
             -v USE_NETCONF_CONNECTOR:False
             -v SCHEMA_MODEL:juniper
-            -v INIT_DEVICE_COUNT:5000
+            -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
     install:
       - manual:

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index 978ba1e0f201067c16669bcc14bc82265f413c07..ec132bdced2bec4702e031c2c6cac04ec51a4d7c 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: odlmicro-phosphorus
+    name: odlmicro-sulfur
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: odlmicro
     project-name: "odlmicro"
     branch: "master"
@@ -19,15 +19,15 @@
     staging-profile-id: 44ce67428fd0d
 
 - project:
-    name: odlmicro-silicon
+    name: odlmicro-phosphorus
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: odlmicro
     project-name: "odlmicro"
-    branch: "stable/silicon"
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     build-node: centos7-builder-2c-2g
     build-timeout: 60
@@ -38,15 +38,15 @@
     staging-profile-id: 44ce67428fd0d
 
 - project:
-    name: odlmicro-aluminium
+    name: odlmicro-silicon
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: odlmicro
     project-name: "odlmicro"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     build-node: centos7-builder-2c-2g
     build-timeout: 60

diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml
index 8939180cc0e1633729fcd08993702f3b99ae9a27..c03d622a88d88ea951bb3b64c823928776bf517c 100644 (file)
--- a/jjb/odlparent/odlparent-patch-test.yaml
+++ b/jjb/odlparent/odlparent-patch-test.yaml
@@ -7,12 +7,12 @@
     project: "odlparent"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     os-branch: "queens"
 

diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
index 2c5cf969ebfbfff570ffe6975023e8b22d1e3bb8..d8614e6549bf9993b9e41aa99a6ce7bb94a78e5f 100644 (file)
--- a/jjb/odlsaf/odlsaf.yaml
+++ b/jjb/odlsaf/odlsaf.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: odlsaf-phosphorus
+    name: odlsaf-sulfur
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: "odlsaf"
     project-name: "odlsaf"
     build-node: centos7-builder-4c-4g
@@ -20,17 +20,17 @@
     staging-profile-id: 2802f0e38ee665
 
 - project:
-    name: odlsaf-silicon
+    name: odlsaf-phosphorus
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "odlsaf"
     project-name: "odlsaf"
     build-node: centos7-builder-4c-4g
     build-timeout: 120
-    branch: "stable/silicon"
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "odlsaf-settings"
     mvn-opts: "-Xmx2048m"
@@ -40,17 +40,17 @@
     staging-profile-id: 2802f0e38ee665
 
 - project:
-    name: odlsaf-aluminium
+    name: odlsaf-silicon
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "odlsaf"
     project-name: "odlsaf"
     build-node: centos7-builder-4c-4g
     build-timeout: 120
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "odlsaf-settings"
     mvn-opts: "-Xmx2048m"

diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml
index 23a14691a541fe8f8c3a1eeec2cbe3e9eb44cf1a..83c6fa45f39e0ec6879245840789949762c464da 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -10,15 +10,15 @@
     testplan: "{project}-basic.txt"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     functionality:
       - "upstream"

diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml
index 9a813510a05268ea597750f8ee7b51b3dfe86550..ace2a005a26e90a7885f6ab2ba0d741f9ff26dea 100644 (file)
--- a/jjb/odltools/odltools-patch-test.yaml
+++ b/jjb/odltools/odltools-patch-test.yaml
@@ -8,12 +8,12 @@
     jdk: openjdk8
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     feature:
       - current:

diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml
index 83c30e9196fc57ead67e82cc77f11e23ccc70bcb..41356693b6d95476019c527af4ec69439f7729d3 100644 (file)
--- a/jjb/odltools/odltools.yaml
+++ b/jjb/odltools/odltools.yaml
@@ -13,8 +13,6 @@
     stream:
       - silicon:
           branch: "master"
-      - aluminium:
-          branch: "stable/aluminium"
 
     project: odltools
     project-name: odltools

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 392846bcccceeb91332de553d50e216dcde2ba6d..89b61017919e78d461410d16d9a0c00f4a2d9ed5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index a66083d135cff88a0f066c00128d822961ad1367..3e6f8ab07d10576e4b896dd09bd26193a90553cd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          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 21ff1794a63c200f76a1cdf4928ce603287d5a0b..72ea2dec353ebedd15d5925a4979eb38e97a2c7e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 8bc00981657d34d3e8267e518fdd24173f353d72..2c96b68e1ed064eb09eacf8687194ba4b69cddf7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index ecb5d8c3be483f4854569d1263d0108bbc22b7fe..b1b92d5b5537ffda4640684bf6702946612c06d1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -14,16 +14,16 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           install: "all"
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           jre: "openjdk11"
           install: "all"
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           jre: "openjdk11"
           install: "all"
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 3f0b4e17dcae26a7a043e581fc72fe9a63ae5f08..3691ceb66b109da27640ec00c1f99deb26d55ce8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -12,19 +12,19 @@
     functionality: "longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 2918f17b240e1ca8b7f0b9915b880e111a87f482..3c9536a32207535f4cd935f5113f4a12fd74319a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          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 58a20d294c68790a26113ea8619802f6ac7ed288..6876ce0f9e444e167cf69e3f0ee076aa30a2e1d0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index f68de4c617850ba23b5fe1114d5f242f123995f5..6e2214cb088679a3f1628c3adde493b5f729108d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -13,15 +13,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 02817a04c5b5dcea094ac4a5ee62125924b2c89e..3f482ea4297c5486d62642654708e03e16a2d91f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index d4baa939dde3f7295e02a5fb23e20512a80c8ef9..02faaff4cc5c70dad6d8236ede213bda647d9c73 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 992d6750fac6656d2616ba10a5d3cc3de5666cdc..beeb2a5fbf07272ac60de05996a518d96ee4366c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 216d021108482789ef641b1b943988bbe47cb99c..403ef0953ac63deb430c543c950b062bfb625d66 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,15 +9,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 3758d413527b50c045e2653b9689e75603bae1b7..3f79455681117996eb4a05f831cba4694dbc2c7e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: openflowplugin-phosphorus
+    name: openflowplugin-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -13,7 +13,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: "openflowplugin"
     project-name: "openflowplugin"
     branch: "master"
@@ -32,7 +32,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-silicon
+    name: openflowplugin-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -45,16 +45,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "stable/silicon"
-    build-node: centos7-builder-2c-8g
+    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"
-    mvn-opts: "-Xmx1024m"
     dependencies: >
       odlparent-merge-{stream},
       yangtools-merge-{stream},
@@ -65,7 +64,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-aluminium
+    name: openflowplugin-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -78,10 +77,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index d1a6f8f48b4333feba546bc025b2da5ec15757c4..528aa400f4c6e21a57ccc3f376500d1fb303ab7c 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index fcd1b5c425e987687d61432c69b4c0f015ea6c2b..ea353fb7e18f878292493a2150ca18d6ec068222 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index bd23250509168bd99b22924b426ef60602cbc96e..1953d9222aed9f17a79a6376f3aeb9b72973079f 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,15 +5,15 @@
       - "ovsdb-daily-full-integration-{stream}"
 
     stream:
-      - phosphorus:
+      - sulfur:
           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"
 
     project: "ovsdb"
     archive-artifacts: "*.log"

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 493978ac2df0de81cf9bcc2342fbff3ce4d5885f..eef2ef960bd91b693e0129350c24cc797462ef01 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,15 +8,15 @@
     project: "ovsdb"
 
     stream:
-      - phosphorus:
+      - sulfur:
           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"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 173b31ba22a7584543d434c776231565154351d3..98aa86d77dca687aef7f961f6a373b8ef1738904 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: ovsdb-phosphorus
+    name: ovsdb-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -12,7 +12,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: "ovsdb"
     project-name: "ovsdb"
     branch: "master"
@@ -26,7 +26,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-silicon
+    name: ovsdb-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -38,14 +38,13 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/silicon"
-    build-node: centos7-builder-2c-8g
+    branch: "stable/phosphorus"
+    build-node: centos7-builder-4c-4g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
     email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
 
@@ -53,7 +52,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-aluminium
+    name: ovsdb-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -65,10 +64,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index b2ea5b1b5007a0f8943d73dac5398c27c4082f60..cdee1905f08606636655fcc7fe40964ec737a8b5 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: p4plugin-phosphorus
+    name: p4plugin-sulfur
     jobs:
       - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: "p4plugin"
     project-name: "p4plugin"
     branch: "master"
@@ -19,16 +19,16 @@
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-silicon
+    name: p4plugin-phosphorus
     jobs:
       - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "p4plugin"
     project-name: "p4plugin"
-    branch: "stable/silicon"
+    branch: "stable/phosphorus"
     mvn-settings: "p4plugin-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: ""
@@ -38,16 +38,16 @@
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-aluminium
+    name: p4plugin-silicon
     jobs:
       - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "p4plugin"
     project-name: "p4plugin"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     mvn-settings: "p4plugin-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: ""

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index b2ae4a58c6e01581a1c96f00f3cfa87b68f7dd96..d97d9987b39280b77f1d67ebac490573642c153c 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -1,22 +1,12 @@
 ---
-- packaging_common:
-    &packaging_common # values apply to all packaging docker projects
-    name: packaging-common
-    # git repo
+- project:
+    name: packaging-docker
     project: integration/packaging
-    # jenkins job name prefix
     project-name: packaging
-    # maven settings file has docker credentials
     mvn-settings: packaging-settings
-    # source of docker tag
     container-tag-method: yaml-file
-    # build node
     build-node: centos7-docker-4c-4g
-
-- project:
-    <<: *packaging_common
-    name: packaging-docker
-    docker-name: "opendaylight"
+    docker-name: "opendaylight/opendaylight"
     docker-root: "$WORKSPACE/odl-docker"
     docker-build-args: "--network=host"
     pre_docker_build_script: "$WORKSPACE/odl-docker/install_docker.sh"
@@ -32,8 +22,12 @@
           branch: stable/silicon
 
 - project:
-    <<: *packaging_common
     name: packaging-release
+    project: integration/packaging
+    project-name: packaging
+    mvn-settings: packaging-settings
+    container-tag-method: yaml-file
+    build-node: centos7-docker-4c-4g
     jobs:
       - "{project-name}-gerrit-release-jobs"
 

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index a38df8164ce3dc77d2fd5d33c5ee4927d0762449..a10f2e114a09f531d1018fe88360377a8ee5b4f3 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -7,12 +7,12 @@
     project: "serviceutils"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     os-branch: "queens"
     jdk: "openjdk8"

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 50ba04b5c607ed9a1f835c03230a20221a8137c7..dd5998ad6c7105f9e1846d8fa6382866597078c6 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-phosphorus
+    name: serviceutils-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -13,7 +13,7 @@
       - odl-maven-verify-jobs
 
     branch: "master"
-    stream: phosphorus
+    stream: sulfur
 
     project: "serviceutils"
     project-name: "serviceutils"
@@ -32,7 +32,7 @@
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-silicon
+    name: serviceutils-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -44,8 +44,8 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    branch: "stable/silicon"
-    stream: silicon
+    branch: "stable/phosphorus"
+    stream: phosphorus
 
     project: "serviceutils"
     project-name: "serviceutils"
@@ -64,7 +64,7 @@
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-aluminium
+    name: serviceutils-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -76,8 +76,8 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    branch: "stable/aluminium"
-    stream: aluminium
+    branch: "stable/silicon"
+    stream: silicon
 
     project: "serviceutils"
     project-name: "serviceutils"

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index c49b9c9ab3c8322144b992cf2430d343cb72760f..ec51b9144a45bb3af87835a3067d60ca612906de 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -12,15 +12,9 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - master:
           branch: "master"
           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 fc1ddf4e0f9b728f0d1bdfb892ee45e2791860de..d6052bcef67418f27fa7ca424ad54d05367f1a6b 100644 (file)
--- a/jjb/sxp/sxp-csit-binding-origin.yaml
+++ b/jjb/sxp/sxp-csit-binding-origin.yaml
@@ -12,15 +12,9 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - master:
           branch: "master"
           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 6b6e7cab8192a6185f35419a3da491de33ca38c5..91651acaffce5845ad665e76e9411794ddee67e8 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-binding.yaml
+++ b/jjb/sxp/sxp-csit-cluster-binding.yaml
@@ -12,15 +12,9 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - master:
           branch: "master"
           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 3d01a6f79383b9f07ad7692fb6df405327f838dd..45b3a37423b6de5a92561995c25e4f5f52370418 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,15 +12,9 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - master:
           branch: "master"
           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 2b932a3479d3334db501a6c61254d76ab5b4e9af..4ab96d353ff7afd039e17c0d90c1e25858f27c2c 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -12,15 +12,9 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - master:
           branch: "master"
           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 a981c15255b96ea06982eef026ed5b6f27cd0ead..8f6ecaccdb5ab8de548b2947eea5f1b6de689e80 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -12,15 +12,9 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - master:
           branch: "master"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 2190c0fc42854cdea05fb1df8fe7fe182b3ad2de..63e4fcecfbcd6674f6581abea648a257a497f236 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           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 1221bf20d4ffca3e124589a0fc5cd2bd191ce293..0c1a629239dcf9250fa68b53bfe68611ad3d4d98 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-phosphorus
+    name: sxp-master
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -12,7 +12,7 @@
 
     java-version: "openjdk11"
 
-    stream: phosphorus
+    stream: master
     project: "sxp"
     project-name: "sxp"
     branch: "master"
@@ -26,60 +26,6 @@
     # 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:

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 2f07ab50c1efb377c16fc4db63464cb9d921b2db..b377c29f3dd35e5cd55cf94212421ef3af4b6dc3 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: transportpce-phosphorus
+    name: transportpce-sulfur
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -16,7 +16,7 @@
 
     project: "transportpce"
     project-name: "transportpce"
-    stream: phosphorus
+    stream: sulfur
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "transportpce-settings"
@@ -28,7 +28,7 @@
     staging-profile-id: a6927323fa3d4
 
 - project:
-    name: transportpce-silicon
+    name: transportpce-phosphorus
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -38,13 +38,14 @@
       - 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: silicon
-    branch: "stable/silicon"
+    stream: phosphorus
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "transportpce-settings"
     mvn-opts: "-Xmx1024m"
@@ -55,7 +56,7 @@
     staging-profile-id: a6927323fa3d4
 
 - project:
-    name: transportpce-aluminium
+    name: transportpce-silicon
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -70,8 +71,8 @@
 
     project: "transportpce"
     project-name: "transportpce"
-    stream: aluminium
-    branch: "stable/aluminium"
+    stream: silicon
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "transportpce-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 40e9ceda7c176aa347f73aa466c17f81b22d894e..c47acfd1ddb1ec981bc4f687c9ebe6b8cff508ef 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -12,15 +12,15 @@
 
     # Project branches.
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:

diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
index 142d7e71af6ff7636bb5036bd6eea758bd38c933..ea488023f069545658e62191f43ab697a0db0992 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -7,15 +7,15 @@
     project: "yangtools"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "6.0.x"
           jre: "openjdk11"
-      - aluminium:
-          branch: "5.0.x"
-          jre: "openjdk11"
 
     feature:
       - core:

diff --git a/scripts/cut-branch-jobs.py b/scripts/cut-branch-jobs.py
index a1c813ae57a208819d50489663fc6acce1a43550..88cf3cb97817b6574da19dbac5655177d6fc95ff 100755 (executable)
--- a/scripts/cut-branch-jobs.py
+++ b/scripts/cut-branch-jobs.py
@@ -346,7 +346,7 @@ parser.add_argument(
     metavar="RELEASE_ON_CURRENT_BRANCH",
     type=str,
     help="""The ODL release codename for the new {}
-        (eg. Aluminium, Silicon).""".format(
+        (eg. Silicon, Phosphorus).""".format(
         default_branch
     ),
 )