summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/joid/joid.yml6
-rw-r--r--jjb/opnfv/pod-params.yml8
2 files changed, 8 insertions, 6 deletions
diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
index e4e04379b..94e110056 100644
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid.yml
@@ -7,8 +7,7 @@
installer: 'joid'
- controller:
- - 'odl'
+ controller: 'odl'
pod: 'intel-pod5'
@@ -67,7 +66,8 @@
- project-parameter:
project: '{installer}'
- '{pod}-defaults'
- - '{installer}-defaults'
+ - '{installer}-defaults':
+ controller: '{controller}'
scm:
- git-scm:
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index 6bddb66c0..e62450c18 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -164,11 +164,13 @@
parameters:
- node:
name: SLAVE_NAME
- description: 'Label on Jenkins'
+ description: 'Slave name on Jenkins'
allowed-slaves:
- - opnfv-build
+ - intel-us-build-1
+ - ericsson-ca-build-1
default-slaves:
- - opnfv-build
+ - intel-us-build-1
+ - ericsson-ca-build-1
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT