summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2016-11-30 05:11:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-30 05:11:28 +0000
commitce14e0678addbfc0e1e55ba37811981322475197 (patch)
treeacafcbe9d2793e43582151b61805d06b6e2e985f /jjb
parent58e754eb9afa05c9bb6c90da1f1a6882b3e866cd (diff)
parent1527b820ba71d8390890bb0d43ec7bdcc4741f09 (diff)
Merge "update doctor CI job"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/doctor/doctor.yml48
1 files changed, 25 insertions, 23 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 4958ca2b5..5bf34aca5 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -7,12 +7,12 @@
- master:
branch: '{stream}'
gs-pathname: ''
- docker_tag: 'master'
+ docker-tag: 'master'
disabled: false
- colorado:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- docker_tag: 'stable'
+ docker-tag: 'stable'
disabled: false
installer:
@@ -20,9 +20,13 @@
slave-label: 'ool-virtual1'
pod: 'ool-virtual1'
+ inspector:
+ - 'sample'
+ - 'congress'
+
jobs:
- 'doctor-verify-{stream}'
- - 'doctor-verify-{installer}-{stream}'
+ - 'doctor-verify-{installer}-{inspector}-{stream}'
- job-template:
name: 'doctor-verify-{stream}'
@@ -68,7 +72,7 @@
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
- job-template:
- name: 'doctor-verify-{installer}-{stream}'
+ name: 'doctor-verify-{installer}-{inspector}-{stream}'
node: '{slave-label}'
@@ -81,7 +85,21 @@
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'
+ - string:
+ name: DOCKER_TAG
+ default: '{docker-tag}'
+ description: 'Tag to pull docker image'
+ - functest-parameter:
+ gs-pathname: '{gs-pathname}'
+ CI_DEBUG: 'true'
scm:
- gerrit-trigger-scm:
@@ -117,25 +135,9 @@
notbuilt: true
builders:
- - trigger-builds:
- - 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
- DEPLOY_SCENARIO=os-nosdn-nofeature-ha
- TESTCASE_OPTIONS=-e INSPECTOR_TYPE=congress -v $WORKSPACE:$HOME/opnfv/repos/doctor
- block: true
- same-node: true
+ - description-setter:
+ description: "POD: $NODE_NAME"
+ - 'functest-suite-builder'
publishers:
- postbuildscript: