diff options
| author |   mei mei <meimei@huawei.com> | 2018-05-08 01:32:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-08 01:32:33 +0000 |
| commit | 523d67bd309294cf3bf9f6ad1c68481c7ef2ae4c (patch) | |
| tree | 51a7716c47ff327d8b82e6a7a015f39ff527a3b9 /jjb | |
| parent | 8c3064630e035195657120b81192a62636657e8c (diff) | |
| parent | a23a0a40ee9ba97269f23e8edd9e897ca2d4f97a (diff) | |
Merge "JJB 2.0.X does not allow scenario to be passed here"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 88fb02605..8eeaabfaa 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -162,8 +162,6 @@ block-level: 'NODE' wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - fix-workspace-permissions parameters: @@ -174,7 +172,6 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' - scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -362,7 +359,6 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' - scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -409,10 +405,10 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' - scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' + scm: - git-scm @@ -457,7 +453,7 @@ description: "Directory where the logs will be located upon the completion of the collection." - string: name: DEPLOY_SCENARIO - default: '{scenario}' + default: 'os-nosdn-nofeature-ha' description: "Scenario to deploy with." - string: name: COMPASS_OS_VERSION |