summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-28 21:18:05 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-28 20:30:53 +0000
commitf02921f26211d22fe318bd19a5f210d682fedd08 (patch)
treef84845c2d67ad2cb28233f4fec93ab4173099c5c /jjb
parent7e7209b723ba5389bf932f369bfa07e8f66c35db (diff)
Add new slaves for build and configure jobs accordingly
Change-Id: Iccade77c68013a8b52a38f45ca46c5944fc2ded7 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/fuel/fuel-project-jobs.yml17
-rw-r--r--jjb/opnfv/slave-params.yml11
2 files changed, 15 insertions, 13 deletions
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 2e30fb1e6..10d49796c 100644
--- 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 5204f7926..414853784 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -430,6 +430,17 @@
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:
- node: