Add new slaves for build and configure jobs accordingly

Change-Id: Iccade77c68013a8b52a38f45ca46c5944fc2ded7
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 2e30fb1..10d4979 100644 (file)
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -40,7 +40,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'fuel-build-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
@@ -77,17 +77,12 @@
 
     concurrent: true
 
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 3
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'fuel-build-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
@@ -146,20 +141,16 @@
 
     concurrent: true
 
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 2
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'fuel-build-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 5204f79..4148537 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -429,6 +429,17 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on these Jenkins Slaves'
 
+- parameter:
+    name: 'fuel-build-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'fuel-build'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on these Jenkins Slaves'
+
 - parameter:
     name: 'intel-us-deploy-virtual-2-defaults'
     parameters: