Merge "Adding ability to build from different distribution branches"

diff --git a/jjb-templates/validate-autorelease.yaml b/jjb-templates/validate-autorelease.yaml
index 5332c3184f4fa8ba67dbf64bd55dd66af27f1eee..8ebc14e46bfaf89ceed3ead0fc6de4cd697232c0 100644 (file)
--- a/jjb-templates/validate-autorelease.yaml
+++ b/jjb-templates/validate-autorelease.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'PROJECT_SHORTNAME-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg
index bd106bfe5df38f1c3a8f4498175c93ea7f273d2e..c92ca5416df7fb758210c26a00415c2b57192549 100644 (file)
--- a/jjb/aaa/aaa.cfg
+++ b/jjb/aaa/aaa.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index c634048beecb669a59390ec0c0568f948f9250eb..fc57420b7ab0acf2eb4aabfab2e6539c3cdd8402 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'aaa'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'aaa-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg
index 67b5adea43c5899784ffb25ac2c27e05b716d0e5..7e8a91ab3a322de6b6f67205b79431fa2da0d6ae 100644 (file)
--- a/jjb/alto/alto.cfg
+++ b/jjb/alto/alto.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 48839218f9663e7cb80bdce872a17224f557dfff..5057c334a9297208f264b739f94230236053847d 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -25,13 +25,13 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'alto'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'alto-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg
index a97541e53cf51fb26bb881ec08c76c1ef41fb725..fe1d9f2ff6182d9f631a645f608ea26ae89182a3 100644 (file)
--- a/jjb/armoury/armoury.cfg
+++ b/jjb/armoury/armoury.cfg
@@ -2,5 +2,6 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk8,openjdk7
+    autorelease: true
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,mdsal

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 3d9401b135d61b5f971817c2b8558c4490430c56..94952ac1d375324d2418d1e57b9ab5bce46622c6 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk8
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'armoury'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'armoury-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
index f6e7e63e9203ccd68ed4a5b86b251b1debee7cbb..2b170df0ed257137984e1ad127d3609295ad8c0c 100644 (file)
--- a/jjb/bgpcep/bgpcep.cfg
+++ b/jjb/bgpcep/bgpcep.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 2724b41139359918c660b31b6e4b3131af41bd28..9eaf71df3af8e493e837ff89477203bc44063824 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -25,20 +25,20 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'bgpcep'
 
@@ -532,7 +532,7 @@
 
 - job-template:
     name: 'bgpcep-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg
index 3ca49e60167521b2740c6458ab37f1230ff1584c..5becb24c7b5ac2830619a214af8d4cadf8bed36c 100644 (file)
--- a/jjb/capwap/capwap.cfg
+++ b/jjb/capwap/capwap.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 1235c7e50c047f5024e6e56445670139abe7a6a5..4454894e54322b48e153cd3eaf2cf5fe69f5d465 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -25,13 +25,13 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'capwap'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'capwap-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/centinel/centinel.cfg b/jjb/centinel/centinel.cfg
index 52a70e0184be17800ed012b165e0ec98a86a3e5a..ae96f12ab8f1b0bb6fb70f2a960b9f67a2d582f6 100644 (file)
--- a/jjb/centinel/centinel.cfg
+++ b/jjb/centinel/centinel.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 45f850c37299a626243357b57003fe822413a36c..6e46ec3ea31cf27f399a7650946a64e09b80d072 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'centinel'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'centinel-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
index 5431633ee0649537a38b5897593926231e1642a3..237183d725731870f63ae3a6fc4b12c5d6cb3eb3 100644 (file)
--- a/jjb/controller/controller.cfg
+++ b/jjb/controller/controller.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index c95904ba5b9f8e586bec50befe1a32f94ab9fa0b..b2c919c8e1b4ca38eaba8a01b4e5a3691c6f082b 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -25,20 +25,20 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'controller'
 
@@ -532,7 +532,7 @@
 
 - job-template:
     name: 'controller-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 171052cec420fe86dc01cc7064ae72de4ce584fc..628ae5b9fe447b33014dfb714b582e2a08a2a3e6 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -24,13 +24,13 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'coretutorials'
 
@@ -524,7 +524,7 @@
 
 - job-template:
     name: 'coretutorials-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/defense4all/defense4all.yaml b/jjb/defense4all/defense4all.yaml
index 3762ae32735313fe9da9356f2ba4ba02e87403bd..b33f22b0bd6bb72ca146e14bfd7fe51b57a4676f 100644 (file)
--- a/jjb/defense4all/defense4all.yaml
+++ b/jjb/defense4all/defense4all.yaml
@@ -24,19 +24,19 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'defense4all'
 
@@ -530,7 +530,7 @@
 
 - job-template:
     name: 'defense4all-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg
index 0237266b2732f7825ca59547a371dfa9bcb6bd62..785ed4f12af0453353068ab167cd70293f7ca27a 100644 (file)
--- a/jjb/didm/didm.cfg
+++ b/jjb/didm/didm.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 34cfcee9cfe84f4b3d351925900f4f7da8e1f8f3..7f99bb57d61da2c66da897821facabcf420f59b6 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -25,13 +25,13 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'didm'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'didm-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index e431b38daaf926cbb4a858fd6cac0ba03761466c..24461749958535f72a413d8235bba1a3a52a2b02 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -24,7 +24,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'discovery'
 
@@ -518,7 +518,7 @@
 
 - job-template:
     name: 'discovery-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg
index fb1e37caf2cdd9bed100adfd3e110678c800d16f..81bc06d8cc5df5b000574f09de4a8ea50f557164 100644 (file)
--- a/jjb/dlux/dlux.cfg
+++ b/jjb/dlux/dlux.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 3e367ce70d22590de1d2b96e4ac12bfff9059df3..5798eb2b451079a924c78089b2c649ce951ded71 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'dlux'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'dlux-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg
index fb1e37caf2cdd9bed100adfd3e110678c800d16f..81bc06d8cc5df5b000574f09de4a8ea50f557164 100644 (file)
--- a/jjb/docs/docs.cfg
+++ b/jjb/docs/docs.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 2a2436f7bde44a4389393e3d80c2f16729298887..5115b2a813e9e4c09d38c6e7badf8267fa2e27f5 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'docs'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'docs-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/faas/faas.cfg b/jjb/faas/faas.cfg
index 2bdec41693cf90363d51ad1e7650192dddc1b76c..916bcc46e4653ba67e3e945036c599ccd296fd58 100644 (file)
--- a/jjb/faas/faas.cfg
+++ b/jjb/faas/faas.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index eb3801a02b5a4495bf6ba4453aae780f3bee44e6..6c759992588ef50d7d339ddcef93a450874a70fd 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'faas'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'faas-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
index c9673ee50f73daa68820af7150b4e7287b628010..b5a4f54704404b4614b0f3d76ba2431ecfdb7e57 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 09da637e08e8c43e97e929a38fd141aa24f6584c..b4391a066a3e1b18800dbe8798b78279c0638bbe 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'groupbasedpolicy'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'groupbasedpolicy-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg
index 016f03f6afe3b76455459f78fe13cffa83c1149e..0176c40e1064de0cfc322a63457ba5e4ebd7b010 100644 (file)
--- a/jjb/iotdm/iotdm.cfg
+++ b/jjb/iotdm/iotdm.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 9f671e358dda7854dacf1b9689a6d9142eea1667..2c0cdb5dc5570a9fd2f0009dea7cd4a06d3e4483 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -25,14 +25,14 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'iotdm'
 
@@ -526,7 +526,7 @@
 
 - job-template:
     name: 'iotdm-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg
index 7a6beb9b45d683ed08a5fe622278dc5e62ff0171..1575192d50c3dc1bcd027ae9481826cab25efac3 100644 (file)
--- a/jjb/l2switch/l2switch.cfg
+++ b/jjb/l2switch/l2switch.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 387a263daf43ac36ab8f4db3389aa060a79a1658..112a41ed49ae0afc01a29264c6fb418598e516b4 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'l2switch'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'l2switch-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg
index c210ca33b733f126afafdfdf1ea1f9e97726bb5f..2f8e5b91d8a4e39e0d7457c4f6253c1f6b8794b4 100644 (file)
--- a/jjb/lacp/lacp.cfg
+++ b/jjb/lacp/lacp.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 80ff9d475e741c540cdcc9f0955e6c9aed55de9c..888027d1a8a9fcb1b25ec30232d2a077b4de37e4 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -25,13 +25,13 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'lacp'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'lacp-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg
index 94384d31f13feed19394956872c96fb1a4d6f3bd..d6370749b2676e6f7cb2509da057e543ba96ec6e 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.cfg
+++ b/jjb/lispflowmapping/lispflowmapping.cfg
@@ -3,6 +3,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index a7af3f5af8ff862fe8dd7b175699b8a72dcbe22b..79d0a256ac4617ef81aa627b68c027d5372ea7e7 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -25,20 +25,20 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'lispflowmapping'
 
@@ -532,7 +532,7 @@
 
 - job-template:
     name: 'lispflowmapping-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg
index dc95a8bf5700d397c03c2b06494501124c8f1d8d..2f2b41a2c837e5bfe7bf1f038a703691f271d070 100644 (file)
--- a/jjb/mdsal/mdsal.cfg
+++ b/jjb/mdsal/mdsal.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m
 DEPENDENCIES: odlparent,yangtools

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 8384a1e6d22482291ae6a383f4f5ad7cdf17315a..3edbd26734f6ac925cfa79dea2e47f389b953dd3 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'mdsal'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'mdsal-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg
index c36b85882d0c0a379dbb6112a0f45d6d3d13f880..1b5d748dddbdf9b09567f8ed002b0876daf56c72 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.cfg
+++ b/jjb/messaging4transport/messaging4transport.cfg
@@ -3,3 +3,4 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 9bc4b854d56be765d103f6c241e932b38f072cd7..76e28d7d754e76c51095560f21ccc285d7e61998 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'messaging4transport'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'messaging4transport-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg
index 2bdec41693cf90363d51ad1e7650192dddc1b76c..916bcc46e4653ba67e3e945036c599ccd296fd58 100644 (file)
--- a/jjb/nemo/nemo.cfg
+++ b/jjb/nemo/nemo.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 525b92da0fc8834ea4a1808d2a274bb1934b42e1..2113cb650a01ec0a66a860e494b15decd3747b76 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'nemo'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'nemo-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
new file mode 100644 (file)
index 0000000..4b3b454
--- /dev/null
+++ b/jjb/netconf/netconf-scale.yaml
@@ -0,0 +1,34 @@
+- project:
+    name: netconf-csit-scale
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'netconf'
+
+    # The functionality under test
+    functionality: 'scale'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-netconf-connector-all'
+
+    # Robot custom options
+    robot-options: ''
+
+    # This scaling test can take several hours to finish,
+    # so the job is defined to run once a day.
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
index b7815c7fc5d01c46c165cb33957e1070e7f6999e..a4b52c9fa29cd0fd98121462dd917fa45c215ed2 100644 (file)
--- a/jjb/netconf/netconf.cfg
+++ b/jjb/netconf/netconf.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: aaa,controller,odlparent,yangtools

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index d8aafd261be66e71c25841451f555084cb7bca1b..57f69724f1223ded06435e252ca5fc6c2c331600 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'netconf'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'netconf-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg
index cddb697b9398093fab469c6bef040155f6824170..1c1a46a2011f1b7fbf59191a10cd0a3910ade4ed 100644 (file)
--- a/jjb/netide/netide.cfg
+++ b/jjb/netide/netide.cfg
@@ -2,5 +2,6 @@ STREAMS:
 - beryllium:\r
     branch: master\r
     jdks: openjdk7,openjdk8\r
+    autorelease: true\r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m\r
 DEPENDENCIES: odlparent,yangtools,controller,openflowjava\r

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 958f18ff861bcdedd0bb67d1c8981a6d901e80c8..c26286912097832096a5c4168087a65dddb38aa7 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'netide'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'netide-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg
index 78f57074f23c7ecebe0a0f588103bf3b1f0779af..81908b1e0ec35cd198fa104bd4104e057e408f69 100644 (file)
--- a/jjb/neutron/neutron.cfg
+++ b/jjb/neutron/neutron.cfg
@@ -3,6 +3,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index d03a77056e449a25cfe41212176d2e04a132f6f6..5429120082cb267edd7c30e4c2ed1e13ac20f420 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -24,14 +24,14 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'neutron'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'neutron-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg
index 52a70e0184be17800ed012b165e0ec98a86a3e5a..ae96f12ab8f1b0bb6fb70f2a960b9f67a2d582f6 100644 (file)
--- a/jjb/next/next.cfg
+++ b/jjb/next/next.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 8bdb8ddaec1f360a522dee1b9b2ab3151ddcb319..84f57a939f622a7ea1a17919511d26d999554f90 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'next'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'next-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg
index a6a0e31d57bbef567474cdd09492b5ec26f248cd..bdfd27c3f974e9418c3873741ec1dfb15b4b70a4 100644 (file)
--- a/jjb/nic/nic.cfg
+++ b/jjb/nic/nic.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 1a9e0bca3ce8d00b4670105358a364d3d3382f88..75cd494531b8a629a6ce0748cd33dd73f328ccb4 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -25,13 +25,13 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'nic'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'nic-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
index fb1e37caf2cdd9bed100adfd3e110678c800d16f..81bc06d8cc5df5b000574f09de4a8ea50f557164 100644 (file)
--- a/jjb/odlparent/odlparent.cfg
+++ b/jjb/odlparent/odlparent.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 6553b0e37a828c879addd5d04606edd185de1acf..d28ef96822565b231047fae7750544124ba84fa1 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'odlparent'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'odlparent-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/of-config/of-config.cfg b/jjb/of-config/of-config.cfg
index e76cbf487b5327f68e7d9398dc430af72dda2750..15361094e4bd9011c124446b80ed2c8dbdf06a84 100644 (file)
--- a/jjb/of-config/of-config.cfg
+++ b/jjb/of-config/of-config.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent,netconf

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index c734b0128d5906701a9bdee7188b5f6e83aafbcd..460b2908802d19f6bbb448e5d73bebef9d92a029 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'of-config'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'of-config-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 1dfd6d6ec1c7183bdeec744825c151cfd9fd7637..fb4ee62de1cb540e4f0cc6766d2ecdfe40ced541 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'ofextensions/circuitsw'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'circuitsw-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
index 13729319b7b7d1a6862813879475957af9b44ae6..8f3575638c091a76fa3768bc0cced4f0ed8f1366 100644 (file)
--- a/jjb/openflowjava/openflowjava.cfg
+++ b/jjb/openflowjava/openflowjava.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 6e35cf6fe602aa1cc91e70cd03b7c1163e4f6221..d073b549d0dc8ff4476dc3b0b828404fe45f4d99 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -25,20 +25,20 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'openflowjava'
 
@@ -532,7 +532,7 @@
 
 - job-template:
     name: 'openflowjava-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
index 29c006292470d4f2b65ab06ddef3c1f4622a0796..5b4caaaedfbe517a4264f132bd98918c22c86894 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 9a69446d81c42447e49ce3a807fc0411d4d42a4a..fe6ededbdda2175162686f167beb22b03e66634d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -25,20 +25,20 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'openflowplugin'
 
@@ -534,7 +534,7 @@
 
 - job-template:
     name: 'openflowplugin-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/ovsdb/include-raw-setup-docker.sh b/jjb/ovsdb/include-raw-setup-docker.sh
index 153dd95161e580bbfd26cad2f796355912f7548a..6056b741afb704612cf764e1c63bbd307e093832 100644 (file)
--- a/jjb/ovsdb/include-raw-setup-docker.sh
+++ b/jjb/ovsdb/include-raw-setup-docker.sh
@@ -24,6 +24,8 @@ CID=$(/usr/bin/docker run -p 6641:6640 --privileged=true -d -i -t mgkwill/openvs
 REALCID=`echo $CID | rev | cut -d ' ' -f 1 | rev`
 echo "CID=$REALCID" > env.properties
 echo "OVS_VERSION=${OVS_VERSION}" >> env.properties
+CONTROLLER_IP=`facter ipaddress`
+echo "CONTROLLER_IP=${CONTROLLER_IP}" >> env.properties
 
 echo "---> Waiting..."
 sleep 10

diff --git a/jjb/ovsdb/ovsdb-custom.yaml b/jjb/ovsdb/ovsdb-custom.yaml
index fba1d3631b867f4be18a2650463b24651744eea3..ba2897cce9745cfb0d2105f053a4c61cf05090fe 100644 (file)
--- a/jjb/ovsdb/ovsdb-custom.yaml
+++ b/jjb/ovsdb/ovsdb-custom.yaml
@@ -51,17 +51,18 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - inject:
+            properties-file: env.properties
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'verify -Pintegrationtest,coverage,jenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
+            goals: 'verify -Pintegrationtest,coverage,jenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar -Dovsdb.controller.address=${{CONTROLLER_IP}}'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'
+                - 'ovsdb.userspace.enabled=yes'
             settings: '{ovsdb-settings}'
             global-settings: '{odl-global-settings}'
-        - inject:
-            properties-file: env.properties
         - shell:
             !include-raw-escape include-raw-cleanup-docker.sh
         - jacoco-nojava-workaround

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index ac72fdd4fa41403b27f3aba8957703652952cfbb..a52e8e8495a0b00e26ec16ec175fb7d39f49564b 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -40,21 +40,12 @@
                 - 1.4.6
                 - 1.5.0
                 - 1.6.1
-                - 1.7.0
-                - 1.7.1
                 - 1.7.3
-                - 1.9.0
                 - 1.9.3
-                - 1.10.0
                 - 1.10.2
                 - 1.11.0
-                - 2.0.0
                 - 2.0.1
-                - 2.1.0
-                - 2.1.1
                 - 2.1.2
-                - 2.3.0
-                - 2.3.1
                 - 2.3.2
                 - 2.4.0
         - axis:
@@ -102,13 +93,16 @@
         - wipe-org-opendaylight-repo
         - shell:
             !include-raw-escape include-raw-setup-docker.sh
+        - inject:
+            properties-file: env.properties
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install verify -Pintegrationtest,jenkins -V'
+            goals: 'clean install verify -Pintegrationtest,jenkins -V -Dovsdb.controller.address=${{CONTROLLER_IP}}'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'
+                - 'ovsdb.userspace.enabled=yes'
                 - 'maven.repo.local=/tmp/r'
                 - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
                 - 'stream={stream}'
@@ -116,8 +110,6 @@
                 - '-Xmx1024m -XX:MaxPermSize=256m'
             settings: '{ovsdb-settings}'
             global-settings: '{odl-global-settings}'
-        - inject:
-            properties-file: env.properties
         - shell:
             !include-raw-escape include-raw-cleanup-docker.sh
         - jacoco-nojava-workaround

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 006ae34dee3f18069446b3314e0573a20a4da49e..3dfa07f72bd2f578fbb2e6225777427830e785ab 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -14,6 +14,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 20f1672e7fe4b8b15b9eb87addb22793180cbad7..0fd06648e34a8e34f1a7d39738e6e3c0eb24d0f4 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -23,44 +23,44 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - clustering-netvirt-master:
             branch: 'topic/master/net-virt-clustering'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - neutron-yang-migration:
             branch: 'topic/master/neutron-yang-migration'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - routermanager:
             branch: 'topic/routermanager'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'ovsdb'
 
@@ -494,7 +494,7 @@
 
 - job-template:
     name: 'ovsdb-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg
index 16c40cabac467f2ea57cd51f36606f7582f72933..9a57eb4be0e65260695d4fb62970d471a69a6d8a 100644 (file)
--- a/jjb/packetcable/packetcable.cfg
+++ b/jjb/packetcable/packetcable.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 0d7ace1c6db00b2040b073cc2deb99f3704fc1aa..1618d8bd837f9d83a17ce9ed51e4cfeef204af1a 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'packetcable'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'packetcable-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 08424d3c088443979b626b81c8580c7cd52fb095..a3749c2e0dbab015c3e5c2b33a2bfcadedbc591d 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -25,14 +25,14 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'persistence'
 
@@ -526,7 +526,7 @@
 
 - job-template:
     name: 'persistence-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 11bc33c3c1296a0777c9087da4b4af5572b272f3..42f3bc1f4b3d84832b72cec47acca8bfdafe3243 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -81,6 +81,7 @@
     usecplugin-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1439306569008'
     vpnservice-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1423083445104'
     vtn-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414701949484'
+    yangide-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1448465159080'
     yangtools-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414695171776'
     yang-push-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1440438380950'
 

diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg
index 73510eeaa9d083d10d1bf07dbdcd5dcb0b5236e6..4cd0da21e8bf5e463a7ff261cd82fcec386d6588 100644 (file)
--- a/jjb/reservation/reservation.cfg
+++ b/jjb/reservation/reservation.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index b56a4a4f7d87db9ae74379cc660e04d970bc12e8..89b1bf3447d6281571bbe36bd93ea4a5c9c9c7ea 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -25,13 +25,13 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'reservation'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'reservation-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
index 4f2ffb5c1f94e1739fa957a450d78d573f4797f2..fc7b4263efb4a9f278e19d04ed01b8ca9a898399 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index c73c1e8118614b236de47277518dc9d6b962d52a..a4eaeba2c4345376565977a3e364aa558c994469 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -25,20 +25,20 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'sdninterfaceapp'
 
@@ -532,7 +532,7 @@
 
 - job-template:
     name: 'sdninterfaceapp-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg
index 91ed73ee301b1e2ce29284d843009932d869bd47..e283ebb273eaebd17f981d7242e3e8d39759396a 100644 (file)
--- a/jjb/sfc/sfc.cfg
+++ b/jjb/sfc/sfc.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index f534174e12b92ed5eea14e1aa47e15ff1ac6de05..ac815dd408948d8d76bc4e745cef86c313f7f4c4 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'sfc'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'sfc-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg
index fb1e37caf2cdd9bed100adfd3e110678c800d16f..81bc06d8cc5df5b000574f09de4a8ea50f557164 100644 (file)
--- a/jjb/snbi/snbi.cfg
+++ b/jjb/snbi/snbi.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 37e8c068b807b766bc66167fe4b43d4a2f15e512..6582fcf1219af8e5e215bcea57c48308fff79f59 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'snbi'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'snbi-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg
index 3e7915f7fda3dd82d382c9a083742b09ccd7146b..18efd4d30e19fa9e2d4dd22c397b2577584a543b 100644 (file)
--- a/jjb/snmp/snmp.cfg
+++ b/jjb/snmp/snmp.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index d461e1fab3414c96af045d6bcdc16c950ad9915c..bf318904deb32b7aaf8ba9e42d82ef85883bd4ec 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -25,14 +25,14 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'snmp'
 
@@ -526,7 +526,7 @@
 
 - job-template:
     name: 'snmp-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg
index 66edac599fabfef4f5d8fb7774600a51880c6af7..75874fdb102978743b42a793f78058c9539d9722 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.cfg
+++ b/jjb/snmp4sdn/snmp4sdn.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index fda283e00d93a7ade81b997b436b9c95aaef8bd6..07cdcdce6a485b06ddc5c81c43246d143fe48440 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'snmp4sdn'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'snmp4sdn-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg
index 26163f10be20f3da3b9a089bf83bb6fbd14183f1..a36b6747380a3ee32840259f251e08db618cc179 100644 (file)
--- a/jjb/sxp/sxp.cfg
+++ b/jjb/sxp/sxp.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index f807665860b74f2ac2d4a912ac14e5ce24f4f544..720ba094c38aef4384f858353403803f99ff8c2e 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'sxp'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'sxp-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg
index 4ab923336cd8b68f2ee6632812df818fbe738688..1198c183233f78974dce6129075dc204aad6ec35 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.cfg
+++ b/jjb/tcpmd5/tcpmd5.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 166de6df4610a0b017c000c47dfb94a62ddc8f7f..4a739007c8c7bb497a388b36febb0c3f0852e1cd 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -25,20 +25,20 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'tcpmd5'
 
@@ -532,7 +532,7 @@
 
 - job-template:
     name: 'tcpmd5-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index a96db48fdb757aaf444f6113021b408a67afff46..33b39681978c2bd1d9e0b68131722a7b1ae64980 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -24,7 +24,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'toolkit'
 
@@ -518,7 +518,7 @@
 
 - job-template:
     name: 'toolkit-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg
index e01dd52e19ccdb0d2bb9d820f7f83848de923015..4cce7d7e93ecbf0c8cc7ab0f6fd4c67fb26b4d37 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.cfg
+++ b/jjb/topoprocessing/topoprocessing.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index e970b1b005b9acfed9e308f8bdbe679953512508..51e6fe81bfa7eb451cd846c01bd6cf6dd69fddac 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -25,14 +25,14 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'topoprocessing'
 
@@ -526,7 +526,7 @@
 
 - job-template:
     name: 'topoprocessing-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg
index 6858a4626d0aeec852dec05835b808e0e9f02e02..e4477f0032521d1f99f546af02a93fb96cd98771 100644 (file)
--- a/jjb/tsdr/tsdr.cfg
+++ b/jjb/tsdr/tsdr.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 84a97fd85e14426f4f136fc8ea1dfcaf425df583..50faafbe14f44f2e1878e61b73f6740e8e678d81 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -25,13 +25,13 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'tsdr'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'tsdr-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index d6204abd19f4ca86f9857cf94e447ad3c9af6fa7..d6d766d715a5b53ab9f21036b892b80e79c695b9 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: True
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'ttp'
 
@@ -531,7 +531,7 @@
 
 - job-template:
     name: 'ttp-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg
index 1a44f90dd41cf982d83218ea7f586bf3fb81548f..94a4e09d207367ae2716e8d2a440f3529994b03b 100644 (file)
--- a/jjb/unimgr/unimgr.cfg
+++ b/jjb/unimgr/unimgr.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,yangtools,controller,ovsdb

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 2fe74165a0c3892f03f65345bdb53f895da8dbe6..ef943461a34882dfc91458a6a1fe3f225a0b0fa9 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'unimgr'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'unimgr-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index b1680cd8c5a54f7d4adb8d9af8998159aeaec775..59055ab0a0332b0b68782ff8bdea16df8bb7e35f 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -25,14 +25,14 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: True
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk8
             jdks:
                 - openjdk8
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'usc'
 
@@ -526,7 +526,7 @@
 
 - job-template:
     name: 'usc-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 0c12a8d72c93dd46ba283fc9e6eefb8a7ccbed30..6f1edcfc5f4d362403be21ed0b2c69852145e70a 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: True
+            disable_autorelease: False
 
     project: 'usecplugin'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'usecplugin-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg
index 786219c04fb7b68c31f1f895784e262f18c831c4..54f1cb5d77dda5f8d6d4b796df01dbc1a4bd9851 100644 (file)
--- a/jjb/vpnservice/vpnservice.cfg
+++ b/jjb/vpnservice/vpnservice.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 79ba5f353fd400b70cdc7042ff0af555e723caf6..99b083e78d01481b0200fcaa80c51a5d40eef07f 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -25,13 +25,13 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'vpnservice'
 
@@ -525,7 +525,7 @@
 
 - job-template:
     name: 'vpnservice-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg
index a81fbf2475722b04d6982d9f4b78e6266ef4f146..977ab6a0984a73a87f0c68edf5abba39c976c268 100644 (file)
--- a/jjb/vtn/vtn.cfg
+++ b/jjb/vtn/vtn.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index a13d921c1acab4efd9fc74e49f213198678f1ea3..00f757d6d2ae1ed6de242893d221a253af0d5ca3 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -25,19 +25,19 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'vtn'
 
@@ -533,7 +533,7 @@
 
 - job-template:
     name: 'vtn-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/yang-push/yang-push.cfg b/jjb/yang-push/yang-push.cfg
index 2bdec41693cf90363d51ad1e7650192dddc1b76c..916bcc46e4653ba67e3e945036c599ccd296fd58 100644 (file)
--- a/jjb/yang-push/yang-push.cfg
+++ b/jjb/yang-push/yang-push.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 4ac57bbaf0f7fb88d4d4322c5f73905c5a5c064d..83a49528893f42934b87e9bc2746cab0e0f068f0 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
 
     project: 'yang-push'
 
@@ -519,7 +519,7 @@
 
 - job-template:
     name: 'yang-push-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index a52658855cfa997d2d03e74199f32e3bad898c53..5c9f8bb2287876b2cd96be09eaff838527ed9d80 100644 (file)
--- a/jjb/yangtools/yangtools.cfg
+++ b/jjb/yangtools/yangtools.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index ab889589f8dea904c87f584a1ea309f12cf5d58e..a2d934b6575b8e55d86c2a1603d307da7c6be237 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -24,20 +24,20 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'yangtools'
 
@@ -456,7 +456,7 @@
 
 - job-template:
     name: 'yangtools-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index a5df316dac840145fcdef7abb28d57dc2aebe81d..57ad0ceddc0c6aba7de02d1c12657eca19b364b2 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -85,9 +85,11 @@ for stream, options in streams.items():
         str_streams += "                - %s\n" % jdk.strip()
 
     # Disable autorelease validate job unless project is participating
-    # in autorelease
-    str_streams += "            autorelease: %s\n" % options.get(
-        "autorelease", False)
+    # in autorelease, JJB does not allow flipping a boolean so we have to
+    # flip it here via not operator since the JJB configuration for disabling
+    # a Jenkins Job is "disabled: bool".
+    str_streams += "            disable_autorelease: %s\n" % (not options.get(
+        "autorelease", False))
 
 ###############
 # Handle JDKS #

diff --git a/src/site/markdown/jenkins.markdown b/src/site/markdown/jenkins.markdown
index 10690af98e326e279b07f5af47110f5cb71e63dd..12e136f229473e7bf26a0d925f1f1f6922407993 100644 (file)
--- a/src/site/markdown/jenkins.markdown
+++ b/src/site/markdown/jenkins.markdown
@@ -397,7 +397,7 @@ under the **DEPENDENCIES** variable.
 
 If no dependencies are listed then this job type is disabled by default.
 
-### Patch Test Job
+### <a name="patch_test_job">Patch Test Job</a>
 
 Trigger: **test-integration**