Merge "jjb: move 'node: master' to releng-defaults.yaml"

15 files changed, 2 insertions, 64 deletions

diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml
index 27b4082d6..379a8aecb 100644
--- a/jjb/armband/armband.yml
+++ b/jjb/armband/armband.yml
@@ -31,8 +31,6 @@
 - job-template:
     name: 'armband-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
@@ -126,8 +124,6 @@
 - job-template:
     name: 'armband-merge'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index e31685042..10fdf6ef5 100644
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -36,7 +36,6 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: master
 
     varsetabove: '{somevar}'
 
@@ -72,8 +71,6 @@
 - job-template:
     name: 'availability-verify'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -121,8 +118,6 @@
     #
     # This job's purpose is to update all the JJB
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 40
diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index c0d1b08f2..582fbec5a 100644
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -36,8 +36,6 @@
 - job-template:
     name: 'bottlenecks-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
@@ -78,8 +76,6 @@
 - job-template:
     name: 'bottlenecks-verify'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -123,8 +119,6 @@
 - job-template:
     name: 'bottlenecks-merge'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 98f2863e9..a93af98ec 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -13,7 +13,6 @@
 
 - job_defaults: &job_defaults
     name: job_defaults
-    node: master
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml
index 72faa511c..1566109a4 100644
--- a/jjb/fuel/fuel.yml
+++ b/jjb/fuel/fuel.yml
@@ -358,8 +358,6 @@
 
     disabled: true
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 5f103b144..96b770ba2 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -284,8 +284,6 @@
 - job-template:
     name: 'functest-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
@@ -328,8 +326,6 @@
 - job-template:
     name: 'functest-verify-{stream}'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -373,8 +369,6 @@
 - job-template:
     name: 'functest-merge-{stream}'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index c59aa8fd7..b12e32041 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -245,8 +245,6 @@
 
     disabled: false
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -351,8 +349,6 @@
 
     disabled: false
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 1ef881b27..fca14298d 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -256,8 +256,6 @@
 
     disabled: false
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -372,8 +370,6 @@
 
     disabled: false
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 1783bf641..33d45ccd6 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -41,8 +41,6 @@
 - job-template:
     name: 'octopus-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
@@ -85,8 +83,6 @@
 - job-template:
     name: 'octopus-verify-{stream}'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -130,8 +126,6 @@
 - job-template:
     name: 'octopus-merge-{stream}'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 62d6ad049..bae9c4095 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -24,8 +24,6 @@
 - job-template:
     name: 'opnfv-docs-verify'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -73,8 +71,6 @@
 - job-template:
     name: 'opnfv-docs-merge'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 552522e7c..463d64b81 100644
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -31,8 +31,6 @@
 - job-template:
     name: 'parser-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
@@ -73,8 +71,6 @@
 - job-template:
     name: 'parser-verify'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -118,8 +114,6 @@
 - job-template:
     name: 'parser-merge'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index f1b1695d2..6ab54598d 100644
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -27,8 +27,6 @@
 - job-template:
     name: 'pharos-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
@@ -71,8 +69,6 @@
 - job-template:
     name: 'pharos-verify-{stream}'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -116,8 +112,6 @@
 - job-template:
     name: 'pharos-merge-{stream}'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index c074f1899..76fcef208 100644
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -31,8 +31,6 @@
 - job-template:
     name: 'prediction-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
@@ -73,8 +71,6 @@
 - job-template:
     name: 'prediction-verify'
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -118,8 +114,6 @@
 - job-template:
     name: 'prediction-merge'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 000ba84cb..faf3ea6f9 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -15,3 +15,5 @@
                 - '{ssh-credentials}'
 
     project-type: freestyle
+
+    node: master
diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 3b2b95df5..bd300fde0 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -9,8 +9,6 @@
 - job-template:
     name: builder-verify-jjb
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -62,8 +60,6 @@
 - job-template:
     name: 'builder-merge'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB