Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
xci: Enable yardstick
[releng.git]
/
jjb
/
apex
/
apex-verify-jobs.yaml
diff --git
a/jjb/apex/apex-verify-jobs.yaml
b/jjb/apex/apex-verify-jobs.yaml
index
2f29765
..
f0f99fc
100644
(file)
--- a/
jjb/apex/apex-verify-jobs.yaml
+++ b/
jjb/apex/apex-verify-jobs.yaml
@@
-10,7
+10,7
@@
- master: &master
branch: '{stream}'
gs-pathname: ''
- master: &master
branch: '{stream}'
gs-pathname: ''
- verify-scenario: 'os-nosdn-nofeature-ha'
+ verify-scenario: 'os-nosdn-nofeature-
no
ha'
disabled: false
- fraser: &fraser
branch: 'stable/{stream}'
disabled: false
- fraser: &fraser
branch: 'stable/{stream}'
@@
-194,7
+194,11
@@
max-per-node: 3
max-total: 10
option: 'project'
max-per-node: 3
max-total: 10
option: 'project'
-
+ - build-blocker:
+ use-build-blocker: true
+ block-level: 'NODE'
+ blocking-jobs:
+ - 'apex-.*-promote.*'
builders:
- description-setter:
description: "Built on $NODE_NAME"
builders:
- description-setter:
description: "Built on $NODE_NAME"
@@
-243,9
+247,9
@@
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- FUNCTEST_SUITE_NAME=tempest_smoke
_serial
+ FUNCTEST_SUITE_NAME=tempest_smoke
FUNCTEST_MODE=testcase
FUNCTEST_MODE=testcase
- node-parameters:
fals
e
+ node-parameters:
tru
e
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
@@
-312,6
+316,7
@@
- 'apex-verify.*'
- 'apex-virtual.*'
- 'apex-.*-promote.*'
- 'apex-verify.*'
- 'apex-virtual.*'
- 'apex-.*-promote.*'
+ - 'odl-netvirt.*'
- throttle:
max-per-node: 1
max-total: 10
- throttle:
max-per-node: 1
max-total: 10
@@
-343,6
+348,14
@@
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
+ - shell: |
+ if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
+ echo 'REPO=opnfv' > functest_repo
+ else
+ echo 'REPO=ollivier' > functest_repo
+ fi
+ - inject:
+ properties-file: functest_repo
- multijob:
name: functest-smoke
condition: ALWAYS
- multijob:
name: functest-smoke
condition: ALWAYS
@@
-351,15
+364,16
@@
current-parameters: false
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
current-parameters: false
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
- FUNCTEST_SUITE_NAME=tempest_smoke
_serial
+ FUNCTEST_SUITE_NAME=tempest_smoke
FUNCTEST_MODE=testcase
FUNCTEST_MODE=testcase
+ REPO=$REPO
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
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
- enable-condition: "def m = '$DEPLOY_SCENARIO' !=
k8s-nosdn-nofeature-noha
"
+ enable-condition: "def m = '$DEPLOY_SCENARIO' !=
'k8s-nosdn-nofeature-noha'
"
abort-all-job: true
git-revision: false
- multijob:
abort-all-job: true
git-revision: false
- multijob: