diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-08-30 13:09:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-30 13:09:21 +0000 |
| commit | 5767b8803862959f636e63b56973aba1b4f73fec (patch) | |
| tree | 5b9a1b61effea0f8a4783ab7e185e4ed16ddf775 /jjb | |
| parent | d9b19007810ee6bcd8a326d0dbdf7bd1b0959f54 (diff) | |
| parent | f3d9f3f44776bb8f278b2cd82cfd5dbf20a83fc4 (diff) | |
Merge "Apex: Detect deploy scenario for functest on gate job"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 6 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index a3cd7b3b1..37e74291b 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -410,6 +410,10 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true + - shell: | + echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os-.*') > detected_scenario + - inject: + properties-file: detected_scenario - multijob: name: functest-smoke condition: SUCCESSFUL @@ -417,7 +421,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO={verify-scenario} + DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_SUITE_NAME=healthcheck GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 3f69ff622..1cedaef64 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -322,6 +322,10 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true + - shell: | + echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os-.*') > detected_scenario + - inject: + properties-file: detected_scenario - multijob: name: functest-smoke condition: SUCCESSFUL @@ -329,7 +333,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO={verify-scenario} + DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_SUITE_NAME=healthcheck GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC |