diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2017-06-06 01:56:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-06 01:56:21 +0000 |
| commit | 66b066c839641cfd7a4604af6f111d07dc50f595 (patch) | |
| tree | 900f20ff43139c036332f2d650d3e10a63e6846f /jjb/compass4nfv/compass-ci-jobs.yml | |
| parent | a3bc239313e67cab44d8bc64c32534ac9c1a0886 (diff) | |
| parent | a92e50f2620670cd8d90421c31bd913bf3e941a4 (diff) | |
Merge "set the openstack version for branch"
Diffstat (limited to 'jjb/compass4nfv/compass-ci-jobs.yml')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index e1e760dab..7d67c37fd 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -11,11 +11,13 @@ branch: '{stream}' gs-pathname: '' disabled: false + openstack-version: ocata danube: &danube stream: danube branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false + openstack-version: newton #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- @@ -23,19 +25,19 @@ #-------------------------------- pod: - baremetal: - slave-label: compass-baremetal + slave-label: compass-baremetal-master os-version: 'xenial' <<: *master - virtual: - slave-label: compass-virtual + slave-label: compass-virtual-master os-version: 'xenial' <<: *master - baremetal: - slave-label: compass-baremetal + slave-label: compass-baremetal-branch os-version: 'xenial' <<: *danube - virtual: - slave-label: compass-virtual + slave-label: compass-virtual-branch os-version: 'xenial' <<: *danube #-------------------------------- @@ -133,6 +135,7 @@ predefined-parameters: | DEPLOY_SCENARIO={scenario} COMPASS_OS_VERSION={os-version} + COMPASS_OPENSTACK_VERSION={openstack-version} same-node: true block: true - trigger-builds: @@ -244,10 +247,6 @@ name: GS_URL default: '$GS_BASE{gs-pathname}' description: "URL to Google Storage." - - choice: - name: COMPASS_OPENSTACK_VERSION - choices: - - 'newton' ######################## # trigger macros |