diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2018-02-24 17:55:01 +0800 |
|---|---|---|
| committer | wutianwei <wutianwei1@huawei.com> | 2018-02-26 10:40:51 +0800 |
| commit | 86c3b362830a473093d207a80426d6aaf0f2ba8b (patch) | |
| tree | 30e1fd58dd577f8adcff20d0b2517a28ed14ed05 /jjb/compass4nfv | |
| parent | 71096f12b5abf87dfb257902ec78b3130727bd33 (diff) | |
[compass4nfv] add DEPLOY_SCENARIO macro
fix the error Unrecognized macro 'DEPLOY_SCENARIO' and deploy failed.
Change-Id: Ic34a0d99c2a6026303046c2b350da205372ec78e
Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'jjb/compass4nfv')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 81d76d559..740844702 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -168,9 +168,6 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -429,6 +426,17 @@ name: LOG_DIRECTORY default: $WORKSPACE/log_output description: "Directory where the logs will be located upon the completion of the collection." + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' + description: "Scenario to deploy with." + - string: + name: COMPASS_OS_VERSION + default: '' + - string: + name: COMPASS_OPENSTACK_VERSION + default: '' + ######################## # trigger macros |