diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-01-11 12:36:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-11 12:36:10 +0000 |
| commit | 2d1096b33e73d6ae734398266222bd578548e475 (patch) | |
| tree | a2295709c08d2761c55579cc444e4bc533438091 | |
| parent | c6d685aa45e14d181c48b98d84eb6eb74ccc3215 (diff) | |
| parent | ec61d0dfae55acda30a431f680937018030e5c17 (diff) | |
Merge "[fuel] Run functest hunter against master branch"
| -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 9694ba956..7a878f493 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 3e64c16cd..65205707b 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 3a7af7d97..d31823770 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 ##################################### @@ -144,6 +146,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 |