diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2017-05-23 10:47:58 +0800 |
|---|---|---|
| committer | wutianwei <wutianwei1@huawei.com> | 2017-06-06 09:13:31 +0800 |
| commit | a92e50f2620670cd8d90421c31bd913bf3e941a4 (patch) | |
| tree | 3d71c040e408462631382e0a4218eb4341509a93 /jjb/compass4nfv/compass-ci-jobs.yml | |
| parent | 3d39c8ea99b850b728f2b7753e139943bdcc0807 (diff) | |
set the openstack version for branch
set the openstack version newton for danube
set the openstack version ocata for master
danube branch use the compass.iso
master branch use the compass.tar.gz
separate the branch in the different pod
Change-Id: Iec1e3206cac26bb2ad5379fa2600ede0451d997d
Signed-off-by: wutianwei <wutianwei1@huawei.com>
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 |