diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2016-11-30 06:35:04 +0000 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2016-11-30 10:22:23 +0000 |
| commit | 305717de1f27469a94b408f086ddb936ebcf6417 (patch) | |
| tree | a35685765bc6f2bb4dac225086cecfec84ce7c21 | |
| parent | 7471fc66629d6f138099ec7e2ea5ebf9a68a6289 (diff) | |
doctor: fix parameter setting
In the current doctor jenkins jobs, default parameters for functest are
used.
This patch updates parameter settings, and also simplifies archive
instruction.
Change-Id: I6940d323271bc9492eeb5e9f8ca9faf02612f483
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
| -rw-r--r-- | jjb/doctor/doctor.yml | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 5bf34aca5..dfce40202 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -87,19 +87,39 @@ description: 'OpenStack credentials' - '{installer}-defaults' - '{slave-label}-defaults' - - functest-suite-parameter: - FUNCTEST_SUITE_NAME: 'doctor' - TESTCASE_OPTIONS: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/doctor' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' + # functest - string: name: DOCKER_TAG default: '{docker-tag}' description: 'Tag to pull docker image' - - functest-parameter: - gs-pathname: '{gs-pathname}' - CI_DEBUG: 'true' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' + # functest-suite-parameter + - string: + name: FUNCTEST_SUITE_NAME + default: '{project}' + - string: + name: TESTCASE_OPTIONS + default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/doctor' + description: 'Addtional parameters specific to test case(s)' + # functest-parameter + - string: + name: GS_PATHNAME + default: '{gs-pathname}' + description: "Version directory where the opnfv documents will be stored in gs repository" + - string: + name: FUNCTEST_REPO_DIR + default: "/home/opnfv/repos/functest" + description: "Directory where the Functest repository is cloned" + - string: + name: PUSH_RESULTS_TO_DB + default: "true" + description: "Push the results of all the tests to the resultDB" + - string: + name: CI_DEBUG + default: 'true' + description: "Show debug output information" scm: - gerrit-trigger-scm: @@ -135,20 +155,8 @@ notbuilt: true builders: - - description-setter: - description: "POD: $NODE_NAME" - 'functest-suite-builder' publishers: - - postbuildscript: - builders: - - functest-copy-suite-log: - suite: '{project}' - archive: - artifacts: '{project}.log' - -- builder: - name: functest-copy-suite-log - builders: - - shell: | - cp $HOME/opnfv/functest/results/${{GIT_BRANCH##*/}}/{suite}.log $WORKSPACE/ + artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log' |