diff options
author | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2016-09-19 02:22:26 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-19 02:22:26 +0000 |
commit | c5a5ac59a33dacaaf47b210aee42c75f4459b273 (patch) | |
tree | 53bfe13e43deb424913d4805bdaca5dce9746329 /jjb/doctor | |
parent | 3c11732847926c7b8be63cf1140d415d935cd56c (diff) | |
parent | 5d457c0daae401f004d71ef0a03dba84a9754417 (diff) |
Merge "doctor: use trigger-builders to override param"
Diffstat (limited to 'jjb/doctor')
-rw-r--r-- | jjb/doctor/doctor.yml | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index b53082eb5..fcbd1b0e7 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -83,27 +83,9 @@ default: '{inspector}' description: 'Doctor inspector type to be used' - string: - name: INSTALLER_TYPE - default: apex - description: 'OPNFV Installer type' - - string: name: OS_CREDS default: /home/jenkins/openstack.creds description: 'OpenStack credentials' - - '{installer}-defaults' - - '{slave-label}-defaults' - - 'functest-suite-parameter': - FUNCTEST_SUITE_NAME: '{project}' - TESTCASE_OPTIONS: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/{project}' - - string: - name: DEPLOY_SCENARIO - default: 'os-odl_l2-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker_tag}' - description: 'Tag to pull docker image' - - functest-parameter: - gs-pathname: '{gs-pathname}' scm: - gerrit-trigger-scm: @@ -139,4 +121,11 @@ notbuilt: true builders: - - 'functest-suite-builder' + - trigger-builds: + - project: 'functest-{installer}-virtual-suite-{stream}' + current-parameters: true + predefined-parameters: | + FUNCTEST_SUITE_NAME=doctor + TESTCASE_OPTIONS='-e INSPECTOR_TYPE=$INSPECTOR_TYPE -v $WORKSPACE:$HOME/opnfv/repos/doctor' + block: true + same-node: true |