Update automated project templates

Change-Id: Ie6fcf17c9728aa4efb050c5a1f3bf39ec12524ce
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 5a3f56aaaeaa143b929b131f589a9a7bd9a19135..1ada8661e80235bd8cb083d2697ba1084eef07a8 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 95fb8d62c024f480640dec9deb47e707eff2bdee..753df3923ebe590a58187bf50ed0fed7b59fdcfb 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 9c1b48de883bd52229d5037c12c188d841a6a356..6f249ea83a1d8272839604ffae605064c97fd277 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -305,7 +305,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -367,7 +367,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -651,7 +651,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 66fbc7aa464b6c4f4c2d354022183b3f1e06798a..9d29ab4ca85371fc2ea8998dc209ca691780c4cb 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -296,7 +296,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -358,7 +358,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -642,7 +642,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index b6b4112316ffbd4473ac3c62adbebb389f7f6ba6..64923d2344814cbb64d3e23952545d0ff51b6419 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 0213da80009881d00a99b8e1b329231ab81a7dc8..b2dcb8236b7f11f3773da09d783966e527a703db 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index d8ca41e7dbf84b4acda86f3722704f7a08ebe085..5e5dd29a00ca7a40025cfce3960a61739ec8c8be 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -296,7 +296,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -358,7 +358,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -642,7 +642,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index f61e93e4dbc89652737ac9d7fd82af6721f977a0..8911c8a1740ed1768bf7881e1a00d82f72700dd2 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index e2e3993cfa8e2aad8f2192096fcf46036fcdeb4f..255a15515360b98048d75cdf5bf594f575851e93 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 8d9d6f3d77af31073a17b2eb30e6fe67efe0f582..af049c32a1f16999b0aeaeb0b29ae4f672a40905 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -22,9 +22,9 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
+                - openjdk8
             disable_autorelease: True
             disable_distribution_check: False
         - beryllium:
@@ -310,7 +310,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -372,7 +372,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -656,7 +656,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 12eeb08b5c24d29f135dbbdc70ad386087a7a8e6..89cab116bae23cf47464d3d79c9d92950ba9d40d 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index c8601be1b803b8301f796540a57c1c2298edbcfe..69a2e54f70f20040744118bbc6f7a16210f77a65 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -303,7 +303,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -365,7 +365,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -649,7 +649,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 7ef1c8e72adc6c28febb7f7457520c729a9fb6b1..e74de9e24a5b46ebba9fb17436a9798c1e65bf4f 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 10a1dde2740487e08b97b011ae6f627155d29e2c..c3d0bb31b6167b19430ed166910858a44663e2c2 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 505a7df0bbc4a9195409ce7d7932075ab4454855..14836ba6a79a1ef62f564e49be0491f2b4a5091c 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index ad36440c50ab6a025ea9a77ba9e93a65b450ce9b..5118c6031963768f035924424344e3c230d9c9ae 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -296,7 +296,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -358,7 +358,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -642,7 +642,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 1e2407ac904d6f5fb7d11c962599373b9cc72d3a..1d189dda366c2faee396624e3b28711efe52910b 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 3e7df9a7680d5439e8f4a907194384cb3bfcc486..11e8d5a5c03adc9e651848fa4bbe4530db87290f 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -296,7 +296,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -358,7 +358,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -642,7 +642,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 21c9f30bb0051f6630f411ae7edca931126ab607..854f0be98af59098ea23a67460c570e57b259993 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -296,7 +296,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -358,7 +358,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -642,7 +642,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index be08e30e91cd0d2d5abd0f225a6d16a3b1f6c8b0..e6ef9e09c80016e47cd58299f8dee16a58c5cc65 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -160,7 +160,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index d86caec179a770b86d45180ca7babc1661d4d826..3ab852be4e444999e9bbc21941f731ec8a521449 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index fcb2c283cba0a713226a27976ea19595c4ae9b3a..3b55eabb3024e9c30e92c04330573092f14aecf6 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index c6eefdd166d69a70c8d47ddd7ecffd14dfcf137c..db86d0b39146a0e56a500e8cb704cd8b7a8bbf66 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 564972956953c5bc5961b7c3c6db5eb5b8dd100b..43853df32bddf72c930a1d068ad81a6b27331210 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 646906c387b35e63f4b4cb363abfe40b2e1e7bdf..01b720de275ab56f7c07131615f5f5b2d616701c 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 886338458dfe8d2c7a25340558b6e871ea721f5a..9def61d102085cb221fac581958e3ba342126865 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 6812a2e80708e84ab85e5af99318b91468196ec6..9d182a21f653126dd5d711dd1d441f8c4981051c 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -296,7 +296,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -358,7 +358,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -642,7 +642,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 78bd5823d6a59b349ed00e817c619a0ef60461eb..f40d9d95e1244cdf61302aa191bccfd38330baf6 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 45fcb3d461c2f82f078bcde5546783b41e8de17e..d120e084c6a8d6143cf53f69268899fb8144e3ea 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index f5020a53c159836001f972fee009723a5da94fdc..813141f5740fb51adf6576b2bec116dceb8505eb 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index edee1875f080ffe1a4d4af734c6cff213595e469..a1f24a902a524f4257414fb46e39d53f8838b346 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -303,7 +303,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -365,7 +365,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -588,7 +588,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 0a3b34d95331c637f11b4f29ca849957f2771d6c..417fdae2579e1ee323637270eb15b08bc8dcbf76 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index bf554642fe4ce638a5a3b8e2b7246fdda5b8c015..279ec445b9881ec25e022a7a914aaea16bef805e 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index e534aac412810e807d04357efc73b40c756a4e0c..6a056de55ec73a607baec64825f5d574445e3922 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 9a4a80de7a471317ff4da32b931f22e11cac603a..152c6abff9601d2308aab38d3118e1a2f66e63b3 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -296,7 +296,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -358,7 +358,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -642,7 +642,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 856c87a3474083f7d4134bedb2d81037a3f5336c..6b1d9a2bccba0465f230b8f97dcd491c3f3d6ee9 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index e5cde94283fe0a5801205b36a29a47b48f474a7f..ee66faef2e7961b15c00a11a40878747c0e7e386 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 4420010fab1debb1871c253fafa349e540cd8ce6..8d923d0152bd2354ba8bb82d36b22964b82ecc89 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 71b9805288527f74c703c9fb6ac3b85efc37cb33..5e6cd737a3e05b0ea65f2eee1f7b774122f2b274 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 398224d7efb62f888ed484761e0557183a6f0974..d75cf47b542c4e2483fbe27e2f5bf6803e6a11bf 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index a768a45e1eb563ebbb05398990764500fdc0b882..7d3fd9a45a549722143f62cf9a79c0cb365e097b 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -310,7 +310,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -372,7 +372,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -595,7 +595,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 3e1b39dbea86e8fb7743b7afb0342fb4338a7dae..92241d03e839137d519d9046496bd7b451a98f91 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 95db523c573cdf62e53fd7968d49a6374f4b1648..2d9bccf89b45498803f0d65ea1329a55552f97c7 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -313,7 +313,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -375,7 +375,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -659,7 +659,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index aefd6edc607bc0155e04e0bc366bf5b090dde4d2..544f61b43a8f8bbd936f758c90e21507b1aa87e3 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index a3883ee1425e4e844cbcb131a1fcbd054e36bf79..061f15c23a34566e93046bfdee96e49bb7c98b8e 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index b50c8e13a248011177d0ffe193c4421eafa877ff..7aa84b20f394f445bb7af0f84f4f19fd82b65d43 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 33d131090bf90f1acc09e97577701c1d0e895619..66634f335115af389cc8f4e4283e2c8083d262a1 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index f2e8c8a8d00b2988480e2764f64bcfeb308f1b59..fabddd69d2abbb589fdae847ae1b9cf16b384cab 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 82fa76ca495ea34a2ac76b03185a64612d93a24d..26088c27d835eb89b94580ff4699b2d8bace164a 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index b11174be9c2c0310f5f2afed58b1085b90fb6d34..8e079f1eb357685c0d142ac2539bda85006e612e 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 9ae36b4a2733a96a6bf90acf953af7fd64817add..be737eb02d100134e31c92b166fdc51fdac7f269 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index 0fd1d8130c4d2340d11d867277eea16bc1aef06c..6c6d452f474f1a37a18359bf13aecc697abcdd1b 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -303,7 +303,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -365,7 +365,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -649,7 +649,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 11ac13805ab89ab5425c73ba0a8b2838b02eae14..29e1dc5735297d3a3bbc0683f8f7fe7ee9b028dd 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 06276598a0be5182491d947c84cfd4642cde320c..f3ca6b116911cf93ba8aa49de4b6e98a7d8d4f17 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index f0379092e3d0bb38ffd708d49ad1da9f844fd1b6..9498703564d9a5adfa889e1e923b35111e95074e 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 9dded782aac52b98bc269c9f3bf6ec69f0d78409..424b74c39f39e17380c9e59697279752d0a050c7 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 675b98d20ef02c12af26f739db3c40834d793e26..f7d4b218d49224d5efb32d4755f908f4a4f0b060 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -312,7 +312,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -374,7 +374,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -658,7 +658,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 610cd146850ec6e685c7931091efc6fe293ae816..300ccfe498c60babef73963e27a370bab875512b 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 1f6c0c142079aedb21fa4098c760c2a5f899660a..5c9550081d991bf179a77163df426c43f802dd9c 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 6eee34ab0c700e32a701da65ab7f9ad8a135895a..a76f9f6462f13643f9bf3927a5d10088ef48d1f6 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -311,7 +311,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -373,7 +373,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -657,7 +657,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 6fa3ab53fab7d856d37722c7377d452d703222bf..e1facaaa03be4049bcc245582ed74620e1ab4299 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -304,7 +304,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -366,7 +366,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -650,7 +650,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index 15546e1fb77101a57b2d025bc12dcd477e499c48..3604b7e1b050ed579e67c228554480db5f9310bd 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -296,7 +296,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -358,7 +358,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -642,7 +642,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 4c2622d3b8b5baacf44990c6c2e2ba9aa325403b..18a6c568c8077d5fefeb208483dd0b7de69f08db 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -232,7 +232,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge_8g
+    node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
@@ -294,7 +294,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'
 
@@ -578,7 +578,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify_8g
+    node: dynamic_verify
     concurrent: true
     jdk: '{jdk}'