diff options
Diffstat (limited to 'jjb/apex')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 23 |
2 files changed, 16 insertions, 9 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index e21387ac6..bbceb4b88 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -176,6 +176,8 @@ else # settings for bare metal deployment if [ "$IPV6_FLAG" == "True" ]; then NETWORK_FILE="/root/network/network_settings_v6.yaml" + elif [[ "$JOB_NAME" == *master* ]]; then + NETWORK_FILE="/root/network/network_settings-master.yaml" else NETWORK_FILE="/root/network/network_settings.yaml" fi diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 643972bd2..8bfc53d59 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -220,13 +220,13 @@ git-revision: false block: true same-node: true -# - trigger-builds: -# - project: 'functest-apex-{verify-slave}-suite-{stream}' -# predefined-parameters: | -# DEPLOY_SCENARIO=os-odl_l2-nofeature-ha -# FUNCTEST_SUITE_NAME=healthcheck -# block: true -# same-node: true + - trigger-builds: + - project: 'functest-apex-{verify-slave}-suite-{stream}' + predefined-parameters: | + DEPLOY_SCENARIO=os-odl_l2-nofeature-ha + FUNCTEST_SUITE_NAME=healthcheck + block: true + same-node: true - 'apex-workspace-cleanup' - job-template: @@ -949,11 +949,16 @@ - trigger: name: 'apex-master' triggers: - - timed: '0 0 20 8 *' + - timed: '0 3 * * 0' + - timed: '0 3 * * 4' - trigger: name: 'apex-colorado' triggers: - - timed: '0 3 * * *' + - timed: '0 3 * * 1' + - timed: '0 3 * * 2' + - timed: '0 3 * * 3' + - timed: '0 3 * * 5' + - timed: '0 3 * * 6' - trigger: name: 'apex-gs-clean-{stream}' triggers: |