diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2016-09-21 08:47:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-21 08:47:17 +0000 |
| commit | 82959decbf3fefcf87fde20a95da26d96e1ea418 (patch) | |
| tree | b9a2de77ac4617694bd93b6a818df345f16b0653 | |
| parent | 9873984d340289ab3adcd3a7abf26ea93fc87ac1 (diff) | |
| parent | c05b58a7c4cac047f4c10be8afc13520162ee004 (diff) | |
Merge "[doctor] merge doctor verify jobs"
| -rw-r--r-- | jjb/doctor/doctor.yml | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 84987028c..2010e1229 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -20,13 +20,9 @@ slave-label: 'ool-virtual1' pod: 'ool-virtual1' - inspector: - - sample - - congress - jobs: - 'doctor-verify-{stream}' - - 'doctor-verify-{installer}-{inspector}-{stream}' + - 'doctor-verify-{installer}-{stream}' - job-template: name: 'doctor-verify-{stream}' @@ -72,7 +68,7 @@ - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh" - job-template: - name: 'doctor-verify-{installer}-{inspector}-{stream}' + name: 'doctor-verify-{installer}-{stream}' node: '{slave-label}' @@ -82,10 +78,6 @@ - gerrit-parameter: branch: '{branch}' - string: - name: INSPECTOR_TYPE - default: '{inspector}' - description: 'Doctor inspector type to be used' - - string: name: OS_CREDS default: /home/jenkins/openstack.creds description: 'OpenStack credentials' @@ -129,7 +121,18 @@ - project: 'functest-{installer}-{pod}-suite-{stream}' current-parameters: true predefined-parameters: | + CI_DEBUG=true + FUNCTEST_SUITE_NAME=doctor + DEPLOY_SCENARIO=os-nosdn-nofeature-ha + TESTCASE_OPTIONS=-e INSPECTOR_TYPE=sample -v $WORKSPACE:$HOME/opnfv/repos/doctor + block: true + same-node: true + - project: 'functest-{installer}-{pod}-suite-{stream}' + current-parameters: true + predefined-parameters: | + CI_DEBUG=true FUNCTEST_SUITE_NAME=doctor - TESTCASE_OPTIONS=-e INSPECTOR_TYPE=$INSPECTOR_TYPE -v $WORKSPACE:$HOME/opnfv/repos/doctor + DEPLOY_SCENARIO=os-nosdn-nofeature-ha + TESTCASE_OPTIONS=-e INSPECTOR_TYPE=congress -v $WORKSPACE:$HOME/opnfv/repos/doctor block: true same-node: true |