diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-12-09 21:26:34 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-12-09 21:33:19 +0100 |
| commit | c69cb53988199632b6fd410ccea42a882712dbf7 (patch) | |
| tree | 0566fd552c69d569476d9235bb9b227fcb5f1fd4 | |
| parent | f7897e0ea19c8caaa5293d81a27b633a3ca4c6d2 (diff) | |
Add all opnfv-build slaves into pod-config
Also set default value of controller to ODL.
Change-Id: I14e6619a15f815bb5ce8d6604061990c41060805
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
| -rw-r--r-- | jjb/joid/joid.yml | 6 | ||||
| -rw-r--r-- | jjb/opnfv/pod-params.yml | 8 |
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 |