diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2019-01-10 12:05:34 +0200 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2019-01-10 17:45:48 +0200 |
| commit | ec61d0dfae55acda30a431f680937018030e5c17 (patch) | |
| tree | 5ef9fa2caf29a7a9f05c1b338a147794888e1f29 | |
| parent | ab4b5a257813b172aebd409f68c6483d6383bb99 (diff) | |
[fuel] Run functest hunter against master branch
Fuel has upgraded to OpenStack Rocky on master branch, so in order to
be in sync with the same version of OpenStack in functest, the
container with hunter tag must be ran for fuel master jobs.
Change-Id: I91d7e209847cd74e6f16ff5c9881f1098911e9d9
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yaml | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml index 2ab1a6d53..df01ddadb 100644 --- a/jjb/armband/armband-ci-jobs.yaml +++ b/jjb/armband/armband-ci-jobs.yaml @@ -12,16 +12,19 @@ branch: '{stream}' gs-pathname: '' disabled: false + functest_docker_tag: hunter fraser: &fraser stream: fraser branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' + functest_docker_tag: '{stream}' gambia: &gambia stream: gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false + functest_docker_tag: '{stream}' # ------------------------------- # DEPLOY TYPE ANCHORS # ------------------------------- @@ -161,6 +164,7 @@ current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} + DOCKER_TAG={functest_docker_tag} same-node: true block: true block-thresholds: diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index fb619c3f5..57ed85fcc 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -16,16 +16,19 @@ branch: '{stream}' disabled: false gs-pathname: '' + functest_docker_tag: hunter fraser: &fraser stream: fraser branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' + functest_docker_tag: '{stream}' gambia: &gambia stream: gambia branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' + functest_docker_tag: '{stream}' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- @@ -179,6 +182,7 @@ current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} + DOCKER_TAG={functest_docker_tag} same-node: true block: true block-thresholds: diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index 5695ef8a0..9b8b187eb 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -13,10 +13,12 @@ branch: '{stream}' gs-pathname: '' disabled: false + functest_docker_tag: hunter - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false + functest_docker_tag: '{stream}' ##################################### # cluster architectures ##################################### @@ -146,6 +148,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + DOCKER_TAG={functest_docker_tag} node-parameters: true enable-condition: "def m = ! ('$NODE_LABELS' =~ /armband-virtual/)" kill-phase-on: NEVER |