summaryrefslogtreecommitdiffstats
path: root/jjb/doctor
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/doctor')
-rw-r--r--jjb/doctor/doctor.yml50
1 files changed, 37 insertions, 13 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 5bf34aca5..9a74f4e3d 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -85,21 +85,44 @@
name: OS_CREDS
default: /home/jenkins/openstack.creds
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'
+ name: INSTALLER_TYPE
+ default: '{installer}'
+ description: 'Installer used for deploying OPNFV on this POD'
- 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'
+ description: 'Scenario to deploy and test'
+ # 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,8 +158,6 @@
notbuilt: true
builders:
- - description-setter:
- description: "POD: $NODE_NAME"
- 'functest-suite-builder'
publishers:
@@ -144,11 +165,14 @@
builders:
- functest-copy-suite-log:
suite: '{project}'
+ stream: '{stream}'
+ script-only-if-succeeded: False
+ script-only-if-failed: False
- archive:
- artifacts: '{project}.log'
+ artifacts: '*.log'
- builder:
name: functest-copy-suite-log
builders:
- shell: |
- cp $HOME/opnfv/functest/results/${{GIT_BRANCH##*/}}/{suite}.log $WORKSPACE/
+ cp $HOME/opnfv/functest/results/{stream}/{suite}.log $WORKSPACE/