diff options
-rw-r--r-- | jjb/apex/apex.yml | 68 | ||||
-rw-r--r-- | jjb/apex/apex.yml.j2 | 68 |
2 files changed, 68 insertions, 68 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 597438368..a395cf2e5 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -204,23 +204,23 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true -# - multijob: -# name: functest-smoke -# condition: SUCCESSFUL -# projects: -# - name: 'functest-apex-virtual-suite-{stream}' -# current-parameters: false -# predefined-parameters: | -# DEPLOY_SCENARIO={verify-scenario} -# FUNCTEST_SUITE_NAME=healthcheck -# GERRIT_BRANCH=$GERRIT_BRANCH -# GERRIT_REFSPEC=$GERRIT_REFSPEC -# GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER -# GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE -# node-parameters: true -# kill-phase-on: FAILURE -# abort-all-job: true -# git-revision: false + - multijob: + name: functest-smoke + condition: SUCCESSFUL + projects: + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO={verify-scenario} + FUNCTEST_SUITE_NAME=healthcheck + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false # Verify Scenario Gate - job-template: @@ -299,23 +299,23 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true -# - multijob: -# name: functest-smoke -# condition: SUCCESSFUL -# projects: -# - name: 'functest-apex-virtual-suite-{stream}' -# current-parameters: false -# predefined-parameters: | -# DEPLOY_SCENARIO={verify-scenario} -# FUNCTEST_SUITE_NAME=healthcheck -# GERRIT_BRANCH=$GERRIT_BRANCH -# GERRIT_REFSPEC=$GERRIT_REFSPEC -# GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER -# GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE -# node-parameters: true -# kill-phase-on: FAILURE -# abort-all-job: true -# git-revision: false + - multijob: + name: functest-smoke + condition: SUCCESSFUL + projects: + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO={verify-scenario} + FUNCTEST_SUITE_NAME=healthcheck + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false - job-template: name: 'apex-runner-cperf-{stream}' diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 41a4ee796..752cf281d 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -204,23 +204,23 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true -# - multijob: -# name: functest-smoke -# condition: SUCCESSFUL -# projects: -# - name: 'functest-apex-virtual-suite-{stream}' -# current-parameters: false -# predefined-parameters: | -# DEPLOY_SCENARIO={verify-scenario} -# FUNCTEST_SUITE_NAME=healthcheck -# GERRIT_BRANCH=$GERRIT_BRANCH -# GERRIT_REFSPEC=$GERRIT_REFSPEC -# GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER -# GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE -# node-parameters: true -# kill-phase-on: FAILURE -# abort-all-job: true -# git-revision: false + - multijob: + name: functest-smoke + condition: SUCCESSFUL + projects: + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO={verify-scenario} + FUNCTEST_SUITE_NAME=healthcheck + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false # Verify Scenario Gate - job-template: @@ -299,23 +299,23 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true -# - multijob: -# name: functest-smoke -# condition: SUCCESSFUL -# projects: -# - name: 'functest-apex-virtual-suite-{stream}' -# current-parameters: false -# predefined-parameters: | -# DEPLOY_SCENARIO={verify-scenario} -# FUNCTEST_SUITE_NAME=healthcheck -# GERRIT_BRANCH=$GERRIT_BRANCH -# GERRIT_REFSPEC=$GERRIT_REFSPEC -# GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER -# GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE -# node-parameters: true -# kill-phase-on: FAILURE -# abort-all-job: true -# git-revision: false + - multijob: + name: functest-smoke + condition: SUCCESSFUL + projects: + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO={verify-scenario} + FUNCTEST_SUITE_NAME=healthcheck + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false - job-template: name: 'apex-runner-cperf-{stream}' |