diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-07-08 12:10:40 +0200 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-07-08 12:28:59 +0200 |
| commit | a3258aa1164f76b4e8089ae254916451c4b456b7 (patch) | |
| tree | 6296da794e25be4564005c0873d09fc7460faef6 /jjb/yardstick | |
| parent | 7c5cf2bb8c9dcad58f18b46be6d1f7aded2e1182 (diff) | |
Cleanup slave parameters
This is the first step towards having alignment of the job structure, applying
commit gating and use of labels for all installer jobs.
Apart from the above, it also
- puts all CI baremetal and virtual PODs together
- gets rid of use of slaves directly for CI baremetal and virtual PODs
- switches labels for all CI baremetal and virtual PODs using below labels
{installer}-baremetal
{installer}-virtual
- puts all CI build slaves together and switches to labels - except huawei-build
- puts all none-CI PODs together
Please note that this change does not impact the overall job structure.
Change-Id: I2d8d15799a57fe7e063d39f81b96d19c218b100e
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/yardstick')
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 8b8ced1ba..21a6b80b0 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -49,14 +49,6 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - -# just in case if things go wrong - - lf-pod2: - slave-label: '{pod}' - installer: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - # joid CI PODs - baremetal: slave-label: joid-baremetal diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index c6f317386..5973fcec4 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -31,7 +31,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -70,7 +70,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' |