Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[Compass4nfv]add missing jobs"
[releng.git]
/
jjb
/
apex
/
apex.yaml
diff --git
a/jjb/apex/apex.yaml
b/jjb/apex/apex.yaml
index
5a8f241
..
708b445
100644
(file)
--- a/
jjb/apex/apex.yaml
+++ b/
jjb/apex/apex.yaml
@@
-475,14
+475,6
@@
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
@@
-493,7
+485,6
@@
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
- REPO=$REPO
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@
-586,11
+577,6
@@
abort-all-job: true
git-revision: false
- shell: |
abort-all-job: true
git-revision: false
- shell: |
- if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
- echo 'REPO=opnfv' > functest_properties
- else
- echo 'REPO=ollivier' > functest_properties
- fi
features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
if [ "$features" == 'queens' ]; then
functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p')
features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
if [ "$features" == 'queens' ]; then
functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p')
@@
-599,9
+585,9
@@
else
functest_scenario=$DEPLOY_SCENARIO
fi
else
functest_scenario=$DEPLOY_SCENARIO
fi
- echo "DEPLOY_SCENARIO=$functest_scenario" >
> functest_properties
+ echo "DEPLOY_SCENARIO=$functest_scenario" >
functest_scenario
- inject:
- inject:
- properties-file: functest_
properties
+ properties-file: functest_
scenario
override-build-parameters: true
- multijob:
name: 'OPNFV Test Suite'
override-build-parameters: true
- multijob:
name: 'OPNFV Test Suite'
@@
-885,7
+871,7
@@
description: "Used for overriding the PROMOTE"
- string:
name: GS_URL
description: "Used for overriding the PROMOTE"
- string:
name: GS_URL
- default:
$GS_BASE{gs-pathname}/{os_version}/{topology}
+ default:
'artifacts.opnfv.org/apex/{os_version}/{topology}'
description: "User for overriding GS_URL from apex params"
- string:
name: OS_VERSION
description: "User for overriding GS_URL from apex params"
- string:
name: OS_VERSION
@@
-895,7
+881,10
@@
name: ODL_BRANCH
default: '{odl_branch}'
description: ODL branch being used
name: ODL_BRANCH
default: '{odl_branch}'
description: ODL branch being used
-
+ - string:
+ name: FORCE_PROMOTE
+ default: 'False'
+ description: "Used to force promotion and skip CSIT"
properties:
- build-blocker:
use-build-blocker: true
properties:
- build-blocker:
use-build-blocker: true
@@
-955,6
+944,7
@@
SSH_KEY_PATH=/tmp/csit/id_rsa
ODL_CONTAINERIZED=true
OS_VERSION=$OS_VERSION
SSH_KEY_PATH=/tmp/csit/id_rsa
ODL_CONTAINERIZED=true
OS_VERSION=$OS_VERSION
+ SKIP_CSIT=$FORCE_PROMOTE
node-parameters: true
kill-phase-on: NEVER
abort-all-job: false
node-parameters: true
kill-phase-on: NEVER
abort-all-job: false