Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Apex: add missing builders path to trigger
[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
81e59bd
..
c10a783
100644
(file)
--- a/
jjb/apex/apex-verify-jobs.yaml
+++ b/
jjb/apex/apex-verify-jobs.yaml
@@
-10,6
+10,11
@@
- master: &master
branch: '{stream}'
gs-pathname: ''
- master: &master
branch: '{stream}'
gs-pathname: ''
+ verify-scenario: 'os-nosdn-nofeature-noha'
+ disabled: false
+ - gambia: &gambia
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
verify-scenario: 'os-nosdn-nofeature-ha'
disabled: false
- fraser: &fraser
verify-scenario: 'os-nosdn-nofeature-ha'
disabled: false
- fraser: &fraser
@@
-168,6
+173,8
@@
pattern: 'config/**'
- compare-type: ANT
pattern: 'apex/build/**'
pattern: 'config/**'
- compare-type: ANT
pattern: 'apex/build/**'
+ - compare-type: ANT
+ pattern: 'apex/builders/**'
- compare-type: ANT
pattern: 'apex/common/**'
- compare-type: ANT
- compare-type: ANT
pattern: 'apex/common/**'
- compare-type: ANT
@@
-194,7
+201,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
+ blocking-level: 'NODE'
+ blocking-jobs:
+ - 'apex-.*-promote.*'
builders:
- description-setter:
description: "Built on $NODE_NAME"
builders:
- description-setter:
description: "Built on $NODE_NAME"
@@
-243,9
+254,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
@@
-307,7
+318,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-virtual.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-virtual.*'
@@
-345,13
+356,17
@@
abort-all-job: true
git-revision: true
- shell: |
abort-all-job: true
git-revision: true
- shell: |
- if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
- echo 'REPO=opnfv' > functest_repo
+ features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
+ if [ "$features" == 'rocky' ]; then
+ echo "DOCKER_TAG=hunter" > functest_tag
+ elif [[ "$features" =~ 'rocky' ]]; then
+ echo "DOCKER_TAG=hunter" > functest_tag
else
else
- echo 'REPO=ollivier' > functest_repo
+ echo "DOCKER_TAG=''" > functest_tag
fi
- inject:
fi
- inject:
- properties-file: functest_repo
+ properties-file: functest_tag
+ override-build-parameters: true
- multijob:
name: functest-smoke
condition: ALWAYS
- multijob:
name: functest-smoke
condition: ALWAYS
@@
-360,16
+375,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
+ DOCKER_TAG=$DOCKER_TAG
+ 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: