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: Set installer type for the tested scenario
[releng.git]
/
jjb
/
xci
/
xci-verify-jobs.yml
diff --git
a/jjb/xci/xci-verify-jobs.yml
b/jjb/xci/xci-verify-jobs.yml
index
3902e8e
..
4c9ff9e
100644
(file)
--- a/
jjb/xci/xci-verify-jobs.yml
+++ b/
jjb/xci/xci-verify-jobs.yml
@@
-111,7
+111,7
@@
- compare-type: ANT
pattern: 'xci/scripts/vm/**'
- project-compare-type: 'REG_EXP'
- compare-type: ANT
pattern: 'xci/scripts/vm/**'
- project-compare-type: 'REG_EXP'
- project-pattern: 'sfc|
bgp
vpn'
+ project-pattern: 'sfc|
sdn
vpn'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
@@
-188,6
+188,15
@@
kill-phase-on: NEVER
abort-all-job: true
kill-phase-on: NEVER
abort-all-job: true
+ publishers:
+ - postbuildscript:
+ script-only-if-succeeded: false
+ script-only-if-failed: false
+ builders:
+ - shell:
+ !include-raw: ./xci-cleanup.sh
+
+
- job-template:
name: 'xci-verify-{distro}-{phase}-{type}-{stream}'
- job-template:
name: 'xci-verify-{distro}-{phase}-{type}-{stream}'
@@
-228,9
+237,6
@@
- string:
name: OPNFV_RELENG_DEV_PATH
default: $WORKSPACE/
- string:
name: OPNFV_RELENG_DEV_PATH
default: $WORKSPACE/
- - string:
- name: INSTALLER_TYPE
- default: 'osa'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@
-274,4
+280,4
@@
name: 'xci-verify-healthcheck-macro'
builders:
- shell:
name: 'xci-verify-healthcheck-macro'
builders:
- shell:
- !include-raw: ./xci-
cleanup
.sh
+ !include-raw: ./xci-
run-functest
.sh