diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-05 00:26:10 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-05 00:26:10 +0200 |
| commit | dc99f96c8b7d29916b5e40ace92f929c2b631798 (patch) | |
| tree | 08c29dfd4165017eb2da5b720008c242972883c3 /jjb | |
| parent | 8f2dfa0d6881e43aa8f2f52b51bdaf3c64d1efb6 (diff) | |
armband: Fix Fuel collect job reference
Armband uses different 'pod' naming/labeling, so instead of Fuel's
'baremetal' reference, we have 'armband-baremetal', leading to
unresolved job references for the recently added log collection.
Fix that by adding a new 'deploy-type' variable, which corresponds
to either 'baremetal' or 'virtual', aligning with Fuel naming.
While at it, slightly refactor our pod definitions to use the new var.
Change-Id: Ie84c40a5c208072da2e4766233a844f2670d4f87
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 64c633a3a..f8ed35283 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -18,6 +18,17 @@ gs-pathname: '/{stream}' disabled: false # ------------------------------- + # DEPLOY TYPE ANCHORS + # ------------------------------- + baremetal: &baremetal + installer: 'fuel' + deploy-type: 'baremetal' + slave-label: 'armband-{deploy-type}' + virtual: &virtual + installer: 'fuel' + deploy-type: 'virtual' + slave-label: 'armband-{deploy-type}' + # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- # CI POD's @@ -26,23 +37,19 @@ # ------------------------------- pod: - armband-baremetal: - slave-label: armband-baremetal - installer: fuel + <<: *baremetal <<: *euphrates - armband-virtual: - slave-label: armband-virtual - installer: fuel + <<: *virtual <<: *euphrates # ------------------------------- # master # ------------------------------- - armband-baremetal: - slave-label: armband-baremetal - installer: fuel + <<: *baremetal <<: *master - armband-virtual: - slave-label: armband-virtual - installer: fuel + <<: *virtual <<: *master # ------------------------------- # scenarios @@ -160,7 +167,7 @@ unstable-threshold: 'FAILURE' # Armband uses Fuel's log collection project job, no need to duplicate - trigger-builds: - - project: 'fuel-collect-logs-{pod}-daily-{stream}' + - project: 'fuel-collect-logs-{deploy-type}-daily-{stream}' current-parameters: false block: true same-node: true |