diff options
author | 2017-08-30 08:39:39 -0400 | |
---|---|---|
committer | 2017-08-30 09:02:10 -0400 | |
commit | f3d9f3f44776bb8f278b2cd82cfd5dbf20a83fc4 (patch) | |
tree | cc6c1bff5266aba82e1bcf7d358ca36565626c83 /jjb/apex | |
parent | 95e6b85bffe9df5c38bee18da66d00f9c7c50f6c (diff) |
Apex: Detect deploy scenario for functest on gate job
Change-Id: I3f0119db7b7cade3ddd2dbeaa97e03e1fea58798
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex')
-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 |