diff options
Diffstat (limited to 'jjb/apex/apex.yml')
| -rw-r--r-- | jjb/apex/apex.yml | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 07181fcad..b33c78e0c 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -180,7 +180,7 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: ANT - pattern: 'tests/**' + pattern: 'apex/tests/**' properties: - logrotate-default - throttle: @@ -243,11 +243,18 @@ pattern: 'lib/**' - compare-type: ANT pattern: 'config/**' + - compare-type: ANT + pattern: 'apex/**' properties: - logrotate-default + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + blocking-jobs: + - 'apex-verify.*' - throttle: - max-per-node: 3 + max-per-node: 1 max-total: 10 option: 'project' @@ -370,11 +377,18 @@ pattern: 'lib/**' - compare-type: ANT pattern: 'config/**' + - compare-type: ANT + pattern: 'apex/**' properties: - logrotate-default + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + blocking-jobs: + - 'apex-verify.*' - throttle: - max-per-node: 3 + max-per-node: 1 max-total: 10 option: 'project' @@ -398,6 +412,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 @@ -405,7 +423,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 @@ -582,13 +600,13 @@ concurrent: true disabled: false - + quiet-period: 30 scm: - git-scm-gerrit wrappers: - timeout: - timeout: 120 + timeout: 140 fail: true parameters: @@ -617,6 +635,7 @@ - 'functest.*' - 'yardstick.*' - 'dovetail.*' + - 'storperf.*' - throttle: max-per-node: 1 max-total: 10 @@ -778,6 +797,18 @@ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/" abort-all-job: false git-revision: false +# - multijob: +# name: StorPerf +# condition: ALWAYS +# projects: +# - name: 'storperf-apex-baremetal-daily-{scenario_stream}' +# node-parameters: true +# current-parameters: false +# predefined-parameters: +# DEPLOY_SCENARIO=$DEPLOY_SCENARIO +# kill-phase-on: NEVER +# abort-all-job: false +# git-revision: false # Build status is always success due conditional plugin prefetching # build status before multijob phases execute # - conditional-step: |