Simplify val-autorelease and distro-check state definition

The validate-autorelease and distribution-check jobs use a
activate/disable mechanism from before when releng/builder was using a
custom scripting layer. This is no longer needed as projects can just
remove the unneeded templates directly in their 'project' definition
jjb so let's simplify the JJB code by removing the complexity here.

Also simplify streams to no longer be a list as that is no longer
necessary with the way we are now defining project definitions.

- templates now have a setting of 'disabled: false' to ensure they are
  always enabled if defined.
- remove validate-autorelease and distro-check templates from projects
  that are not participating in the distribution / autorelease.
- enable validate-autorelease job on projects that are participating in
  the distribution / autorelease but mistakenly had those jobs disabled.

Change-Id: Ia4edb4ad0207ddcf9ca4508886fb3f37488f4788
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 29d219139cea80a8c84b0b0beb830ff6a580dcb1..b62cb1d5344298227cd48be3a57a4b678d9bd6a9 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/boron'
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/boron'


@@ -76,11 +68,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/beryllium'
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/beryllium'

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 6f5eeb3932709dd82bb75b929550ce376afaa317..4678a30fce1ebbd2e0eab3b1014eb8302cc88dc7 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'alto'
     project-name: 'alto'
     branch: 'master'
     project: 'alto'
     project-name: 'alto'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'alto'
     project-name: 'alto'
     branch: 'stable/boron'
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/boron'


@@ -76,11 +68,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'alto'
     project-name: 'alto'
     branch: 'stable/beryllium'
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/beryllium'

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 0fbb7e5d441c3d526361e20c785e95bd249001c2..9775fc1c615a71822b6ad843e4a9a8872b3430c6 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -3,18 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: True
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'armoury'
     project-name: 'armoury'
     branch: 'master'
     project: 'armoury'
     project-name: 'armoury'
     branch: 'master'


@@ -37,18 +31,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: False
-
+    stream: boron

     project: 'armoury'
     project-name: 'armoury'
     branch: 'stable/boron'
     project: 'armoury'
     project-name: 'armoury'
     branch: 'stable/boron'


@@ -71,18 +59,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: True
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'armoury'
     project-name: 'armoury'
     branch: 'stable/beryllium'
     project: 'armoury'
     project-name: 'armoury'
     branch: 'stable/beryllium'

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 79695fd90c292e815c1809c396b648b382c46afb..48099cfe4c3aea5e66319bf35eda6a620c6c8513 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: True
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: False
-
+    stream: boron

     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/boron'
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/boron'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 7807939279d476a430faea6d818f6465ab900419..8da543e962145dbd05e5a9c80cd9554a04234a01 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g


@@ -44,11 +40,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g


@@ -79,11 +71,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'bgpcep'
     project-name: 'bgpcep'
     branch: 'stable/beryllium'
     project: 'bgpcep'
     project-name: 'bgpcep'
     branch: 'stable/beryllium'

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index cdb8ce2c0b31d035a2c99741858ab121fc7bffee..965d6a0f7f057f2bb037e7dcdcdd0e238e1cde28 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/boron'
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/boron'


@@ -76,11 +68,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/beryllium'
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/beryllium'

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index e7f824cc702d465a46020f54c10a26bbd6be0a03..ef84cca9250c10e28f85704729b5ce83f4b97066 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'master'
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'stable/boron'
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'stable/boron'

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 56ace49ef69fdfa23b84f6895cc11fd96c07d977..2da513bd351fef9f071b2ee091565837e30109c1 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'centinel'
     project-name: 'centinel'
     branch: 'master'
     project: 'centinel'
     project-name: 'centinel'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/boron'
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/boron'


@@ -76,11 +68,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/beryllium'
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/beryllium'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 2b933c2a3b71fe0c8be87a01f1da1c0c0338c1cf..bbfcb824e5f5070926b3fd1fdc9e6f000bbcefbd 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'controller'
     project-name: 'controller'
     branch: 'master'
     project: 'controller'
     project-name: 'controller'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'controller'
     project-name: 'controller'
     branch: 'stable/boron'
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/boron'


@@ -76,11 +68,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'controller'
     project-name: 'controller'
     branch: 'stable/beryllium'
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/beryllium'

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 872737e1c7b3f1a423f83dc89094bf896a9f54e9..178a69c87be34e1cef006af2830589810183a6cf 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -3,18 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: True
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'master'
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'master'


@@ -36,18 +30,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: False
-
+    stream: boron

     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/boron'
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/boron'


@@ -69,18 +57,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: True
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/beryllium'
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/beryllium'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index d268c69b1c779216338df430b831573ced8d10e2..bd2110405b3923ae9c21c94b34533df44843cac5 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'didm'
     project-name: 'didm'
     branch: 'master'
     project: 'didm'
     project-name: 'didm'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'didm'
     project-name: 'didm'
     branch: 'stable/boron'
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'didm'
     project-name: 'didm'
     branch: 'stable/beryllium'
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/beryllium'

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 440140cb54341f909256f9c461ad87ebba17b1d9..4082cfe26b9054587d4964131a0e0bae1779d17a 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -3,17 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: carbon

     project: 'discovery'
     project-name: 'discovery'
     branch: 'master'
     project: 'discovery'
     project-name: 'discovery'
     branch: 'master'


@@ -35,17 +30,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: boron

     project: 'discovery'
     project-name: 'discovery'
     branch: 'stable/boron'
     project: 'discovery'
     project-name: 'discovery'
     branch: 'stable/boron'


@@ -67,16 +57,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: True
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'discovery'
     project-name: 'discovery'
     branch: 'stable/beryllium'
     project: 'discovery'
     project-name: 'discovery'
     branch: 'stable/beryllium'

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index edf8f0470e322028f8155388e3ff7ce513101938..b46beb5d1155b8449912d00746c7a513984e2324 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/boron'
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/beryllium'
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/beryllium'

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index d911c4a491ffcbb16175d028ebbbfc72258eee37..cfa42e27fbe78d218a530e4401db1a81814c5faf 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -3,16 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: True
+
+    stream: beryllium

     project: 'docs'
     project-name: 'docs'
     branch: 'stable/beryllium'
     project: 'docs'
     project-name: 'docs'
     branch: 'stable/beryllium'

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 19762ba5f170ca609100231887ac4f92b76d972d..da00b8655452f2a5faeabf14384b198dd641114e 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'eman'
     project-name: 'eman'
     branch: 'master'
     project: 'eman'
     project-name: 'eman'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'eman'
     project-name: 'eman'
     branch: 'stable/boron'
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/boron'

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 68c0778757c2ff4d0b02d6664fa74f2c10dbfb71..444d574368e83a8633acc15b559747e53954ee20 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'faas'
     project-name: 'faas'
     branch: 'master'
     project: 'faas'
     project-name: 'faas'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'faas'
     project-name: 'faas'
     branch: 'stable/boron'
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'faas'
     project-name: 'faas'
     branch: 'stable/beryllium'
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/beryllium'

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index b88de70de083b4e641b0f45b201d86d21537a0c4..e8585f8a671867916e53bc6cfaea946b620245f3 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'genius'
     project-name: 'genius'
     branch: 'master'
     project: 'genius'
     project-name: 'genius'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'genius'
     project-name: 'genius'
     branch: 'stable/boron'
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/boron'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 063199e1f9adaa226deae6b43ead232bd1135191..32a3ca23090c7648df8e9cd2d1edb60da2b9a2c0 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/boron'
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/beryllium'
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/beryllium'

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index fe4eb582a6f3445e838bd0b73701460dcf739f14..aff5eacb6bd42e6467e73ff003ab4b0183de91b6 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'stable/boron'
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'stable/boron'

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 8d72f8723977df13f3d7e9335dd2f31bafe0fdd8..1aedf2d1bb7a27584edecb7a3262b07d8ab024bf 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/boron'
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/boron'


@@ -62,7 +56,6 @@
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 

-

 - project:
     name: infrautils-sonar
     jobs:
 - project:
     name: infrautils-sonar
     jobs:

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 100acd9e936653208a22c57a87057deb9e3c1488..deed0abec2cf7cbaa1a75fbd3598aded1fab9abd 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -12,23 +12,17 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
             jdk: openjdk8
             jdks:
                 - openjdk8

-            disable_autorelease: False
-            disable_distribution_check: False

         - boron:
             branch: 'stable/boron'
             jdk: openjdk8
             jdks:
                 - openjdk8
         - boron:
             branch: 'stable/boron'
             jdk: openjdk8
             jdks:
                 - openjdk8

-            disable_autorelease: False
-            disable_distribution_check: False

         - beryllium:
             branch: 'stable/beryllium'
             jdk: openjdk8
             jdks:
                 - openjdk8
                 - openjdk7
         - beryllium:
             branch: 'stable/beryllium'
             jdk: openjdk8
             jdks:
                 - openjdk8
                 - openjdk7

-            disable_autorelease: False
-            disable_distribution_check: False

 
     project: 'integration/distribution'
     project-name: 'distribution'
 
     project: 'integration/distribution'
     project-name: 'distribution'

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 513b0e7b99828ac062593653e7200bc258cb3357..a1cd6fd49544f1f707cc84ce25d412cf2adde5d3 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/boron'
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/beryllium'
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/beryllium'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index b49e327a24cdc085f23294db947b16fcac9f7355..79ad710e216944a4c47da0f0f436fe2419dd8d8e 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/boron'
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/beryllium'
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/beryllium'

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 1c3d3a9505c70c91bfec5fee055eaed33be91a53..e2aeb79dce7d2acac35104ebab7b97ea12fdfa2f 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/boron'
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/beryllium'
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/beryllium'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index c0202de72f66c6da9ccca7a0e6da7fc93d4502d6..28f1e07fc362f90e90787b1d7fd3f8336a62243a 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'


@@ -43,10 +40,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/boron'
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/boron'


@@ -75,10 +69,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/beryllium'
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/beryllium'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index e7d94b8c14405be7b5b764353815664caf0f7c51..33c6e8187d51605854533737b7667b6cdbccca66 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/boron'
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/beryllium'
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/beryllium'

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 1c488c94cebb56ebf25656e47886ebf456d2408b..9e1fcea402f235195fc1a0cf0430099e0b5d9940 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'master'
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/boron'
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/beryllium'
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/beryllium'

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 106d0567bfc7805543e1eafa46b3d9697aa379f6..75abb9dc75ea4fe8597bc29e0a8554a7a0f9da30 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'
     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/boron'
     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/boron'

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 1b7abd66cd806d2909ad671db9d4ec2bf0f13872..f7a2173cc70ec9f1ae6e928dbcd6313823b9bb76 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/boron'
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/beryllium'
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/beryllium'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index e769446825a5aad1deb1d2d716e49c64afa4b0a5..844b9e5bf5505e32d2ab644f8e8a5dd60adb42ad 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/boron'
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/boron'


@@ -73,16 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False

 
 

+    stream: beryllium

     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/beryllium'
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/beryllium'

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index f3092245fbb50cbbf197258b170d83c1f59167f3..0f8410b7623f6b077d0150ad0488a90e797a0b27 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'netide'
     project-name: 'netide'
     branch: 'master'
     project: 'netide'
     project-name: 'netide'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'netide'
     project-name: 'netide'
     branch: 'stable/boron'
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'netide'
     project-name: 'netide'
     branch: 'stable/beryllium'
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/beryllium'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 6d1f146af6d75a3a1147edca881697f6fc367e6b..5b5e36b353a0129273654803bae12c9724e1e845 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'stable/boron'
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'stable/beryllium'
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'stable/beryllium'


@@ -97,18 +89,12 @@
 - project:
     name: netvirt-routermanager
     jobs:
 - project:
     name: netvirt-routermanager
     jobs:

-        - '{project-name}-clm-{stream}'

         - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'

-        - '{project-name}-integration-{stream}'

         - '{project-name}-merge-{stream}'
         - '{project-name}-merge-{stream}'

-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - routermanager:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: routermanager

     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'topic/routermanager'
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'topic/routermanager'

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 19071b7d5078aab67300fd53f261052bb308a976..ba63ab01a29c64862491c7b50af18a057b62f171 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60


@@ -43,10 +40,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'neutron'
     project-name: 'neutron'
     branch: 'stable/boron'
     project: 'neutron'
     project-name: 'neutron'
     branch: 'stable/boron'


@@ -74,10 +68,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'neutron'
     project-name: 'neutron'
     branch: 'stable/beryllium'
     project: 'neutron'
     project-name: 'neutron'
     branch: 'stable/beryllium'

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index fdd39688ef31bc578fccec7843a59f5825deff41..0ce4a4f767d5c217fcb7b07bc4fe70c9f4f19bdf 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'next'
     project-name: 'next'
     branch: 'master'
     project: 'next'
     project-name: 'next'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'next'
     project-name: 'next'
     branch: 'stable/boron'
     project: 'next'
     project-name: 'next'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'next'
     project-name: 'next'
     branch: 'stable/beryllium'
     project: 'next'
     project-name: 'next'
     branch: 'stable/beryllium'

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index a27668160670ffe2f9f07bb25040435996319e7d..37114efc56f5937e3cfaca3032309c88fb6bbb6b 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'nic'
     project-name: 'nic'
     branch: 'master'
     project: 'nic'
     project-name: 'nic'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'nic'
     project-name: 'nic'
     branch: 'stable/boron'
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'nic'
     project-name: 'nic'
     branch: 'stable/beryllium'
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/beryllium'

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 84fa540c9187bba829dc98e3d0f3089b0c694bf9..2d471064a621976b514404afc43b9a32f2ae2c73 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'stable/boron'
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'stable/boron'

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index f5526715e9ffa291e1c533c86271e2cc3619fecf..415dc824a39f0282098e7396a974dc10f6a0ff01 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/boron'
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/boron'


@@ -76,11 +68,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/beryllium'
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/beryllium'

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index dc823235b2307b055c84688666dd080260ab86b5..0dfbb25ca20880acba1fbe166286ba14069363a2 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/boron'
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/beryllium'
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/beryllium'

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index d4e676ebdb8301608f9cecd050c204a47abd2670..436c51870aa9d1827a3bdf47743390fe7c6fdf9c 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -3,17 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'


@@ -35,17 +30,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/boron'
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/boron'


@@ -67,16 +57,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: True
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/beryllium'
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/beryllium'

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index afeedb98b025128265b60638d32d611ff544c04d..f3b1aa3b758dae6675a387dd7ac942a571c25546 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'master'
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'stable/boron'
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'stable/boron'


@@ -73,11 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False

 
 

+    stream: beryllium

     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'stable/beryllium'
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'stable/beryllium'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index b5f067f02987bb8b8ce63f68004d227e641fae8c..ae5fa779a7345ff4071ba2a246235c9edf8704fa 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/boron'
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/beryllium'
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/beryllium'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index e5791b883f1b648b47bc1b34fe0de4635abf8495..6fd0e8099d9f6227f2ce24229e88466bc7f3bc19 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/boron'
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/boron'


@@ -76,11 +68,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/beryllium'
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/beryllium'

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 32dbb6cb5fc825de84d6b7c01c32d32bbb7fbd5e..6530b164bdd612f89a9b12abd53ab6fb0589e954 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/boron'
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/beryllium'
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/beryllium'

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 08ad24273291df8fb6d25c4cda1598fbb50edfb8..70835525a0e82d7875bb95cda43ed775edec10bd 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -3,17 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: carbon

     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'


@@ -36,17 +31,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: boron

     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/boron'
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/boron'


@@ -69,16 +59,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: True
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/beryllium'
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/beryllium'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 9904fa7b79fea124b0608c69afe17803bb41917c..7f5e0367548f1423c4e51b7419042044fa603464 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -135,7 +135,7 @@
     #            the patch, and triggers the distribution deploy test
 
     name: '{project-name}-distribution-check-{stream}'
     #            the patch, and triggers the distribution deploy test
 
     name: '{project-name}-distribution-check-{stream}'

-    disabled: '{obj:disable_distribution_check}'
+    disabled: false

 
     project-type: freestyle
     node: '{build-node}'
 
     project-type: freestyle
     node: '{build-node}'


@@ -554,7 +554,7 @@
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'

-    disabled: '{obj:disable_autorelease}'
+    disabled: false

 
     project-type: freestyle
     node: '{build-node}'
 
     project-type: freestyle
     node: '{build-node}'

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index f103c6c0b0c6496a011bbbdf6ccfb6a99da9d67f..0159517834aefe5c32370d7471bdde3fc07f889b 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -3,17 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'


@@ -35,17 +30,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/boron'
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/boron'


@@ -67,16 +57,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/beryllium'
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/beryllium'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 98b63db9803cc1874a9e3ac114f3c7a7c220b712..a69769f0a4fe227019a33a3aba4418547a11c43a 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/boron'
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/beryllium'
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/beryllium'

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 588885324c5383c6a2aecc34ba64a980e9bfcd18..85a60523355fd9c7e51841eaf53099cbc8a4bc16 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -10,12 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    # stream:    release stream (eg. stable-boron or beryllium)
-    # branch:    git branch (eg. stable/boron or master)
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'


@@ -44,12 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    # stream:    release stream (eg. stable-boron or beryllium)
-    # branch:    git branch (eg. stable/boron or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/boron'
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/boron'


@@ -77,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/beryllium'
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/beryllium'

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index a1d9106ea13ae46051dc2a7b2730f98ec5a0da3e..bc8f7ff9e5fcec919ae5ef78d8b34e7442b083ea 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'snbi'
     project-name: 'snbi'
     branch: 'master'
     project: 'snbi'
     project-name: 'snbi'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/boron'
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/boron'


@@ -74,10 +68,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/beryllium'
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/beryllium'

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 918a3d51a441d04c84fab2170c5d83d054241955..70cd239a53c31026fc0cf4e41885bcd0b80995d8 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/boron'
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/beryllium'
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/beryllium'

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index a59c749effe46585bac57058a6921d3b06e5de10..60eb79c0277719e249a92c5cac008258fa18bb26 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/boron'
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/beryllium'
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/beryllium'

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index bae967075ba6a3f0ce637f2ed848b8cbd6fd5697..6e98ba4f2b429eff5769786507adba51ac55cae0 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/boron'
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/beryllium'
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/beryllium'

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 2425a79da3ffe6f719a783d5ca76dd8bbb1bd9c1..10d2c689c57795a0c37870f12b564a823ac0230e 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -3,17 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'master'
     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'master'


@@ -36,17 +31,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'stable/boron'
     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'stable/boron'


@@ -75,10 +65,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'stable/beryllium'
     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'stable/beryllium'

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index c9170f7d1cfea614b8e1df2f88e3989a58e512af..fcc5b53e04f51cd24f7c797ec1161ea9a991bf37 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/boron'
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/boron'


@@ -76,11 +68,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False

 
 

+    stream: beryllium

     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/beryllium'
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/beryllium'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 36ebeff235f9cf958bb691da68356541a7a993e7..5b552bc117b82b0dfd5a85d929d50207c4b6ecda 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/boron'
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/beryllium'
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/beryllium'

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 250c982e52ec68e1975904c02f0cfe0212b9f079..69e4c9a976128bd4be3d3f785b8c8187b9985348 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/boron'
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/beryllium'
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/beryllium'

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 0e35e0db055ff5046530b0d4261fee9aa81263e2..165c3d6f01b3230634a20dc3a79ee79abbb9d69b 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/boron'
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/boron'


@@ -76,11 +68,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False

 
 

+    stream: beryllium

     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/beryllium'
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/beryllium'

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 90b163260a8395f40d85a5ed4fad42d9ef0fd993..ac1e3830c651bf71787d1f6db1bf85cdb92181f9 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'usc'
     project-name: 'usc'
     branch: 'master'
     project: 'usc'
     project-name: 'usc'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'usc'
     project-name: 'usc'
     branch: 'stable/boron'
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/boron'


@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium

     project: 'usc'
     project-name: 'usc'
     branch: 'stable/beryllium'
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/beryllium'

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index cf838c68a1267ee43e0a8a317443d4d75817545b..fcc1717be2147afb0049826a5258f22c10b9012d 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'master'
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/boron'
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/boron'


@@ -73,11 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False

 
 

+    stream: beryllium

     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/beryllium'
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/beryllium'


@@ -95,7 +86,6 @@
     email-upstream: '[usecplugin] [openflowplugin]'
     archive-artifacts: ''
 
     email-upstream: '[usecplugin] [openflowplugin]'
     archive-artifacts: ''
 

-

 - project:
     name: usecplugin-sonar
     jobs:
 - project:
     name: usecplugin-sonar
     jobs:

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index ea1a970901e9575274b2f78ec69abb3abc8b50d9..2affc424776601361ca79b7f0d8f71b5d084217b 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -3,17 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'vpnservice'
     project-name: 'vpnservice'
     branch: 'master'
     project: 'vpnservice'
     project-name: 'vpnservice'
     branch: 'master'


@@ -35,17 +30,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'vpnservice'
     project-name: 'vpnservice'
     branch: 'stable/boron'
     project: 'vpnservice'
     project-name: 'vpnservice'
     branch: 'stable/boron'


@@ -74,10 +64,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: beryllium

     project: 'vpnservice'
     project-name: 'vpnservice'
     branch: 'stable/beryllium'
     project: 'vpnservice'
     project-name: 'vpnservice'
     branch: 'stable/beryllium'

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 0209c75bdd6f5402f2a61608b7f5a6b17a8319de..7009d994f806d4f2a2065829dba30943e8c2507b 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'


@@ -46,10 +43,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/boron'
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/boron'


@@ -82,11 +76,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/beryllium'
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/beryllium'

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 9b6312b94799075a43662ca441a6739d6aba859a..e4e7ea3fb0b71725a56e3704240c7a6a6f34067f 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon

     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'


@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron

     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/boron'
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/boron'


@@ -74,10 +68,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-      - beryllium:
-          disable_autorelease: False
-          disable_distribution_check: False
+    stream: beryllium

     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/beryllium'
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/beryllium'

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index afd52bf4ad70c9e54ac487074c0e0f0e18cc65d3..47fbc3cb9ca1e29dd72e89d39a74f75bb487d0d0 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -3,18 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: True
-            disable_distribution_check: True
-
+    stream: carbon

     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'
     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'


@@ -36,18 +30,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'

-        - '{project-name}-distribution-check-{stream}'

         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'

-        - '{project-name}-validate-autorelease-{stream}'

         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: True
-
+    stream: boron

     project: 'yangide'
     project-name: 'yangide'
     branch: 'stable/boron'
     project: 'yangide'
     project-name: 'yangide'
     branch: 'stable/boron'

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 936624b7aceb2bd846029be9a165b734d3fcbfc9..10a036cb6f67d16d8cf249ad8550e6721f5c058c 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -10,11 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon

     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'


@@ -43,11 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron

     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/boron'
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/boron'


@@ -78,11 +70,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 

-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium

     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/beryllium'
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/beryllium'