summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2017-01-11 00:23:04 +0000
committerRyota Mibu <r-mibu@cq.jp.nec.com>2017-01-20 05:43:24 +0000
commite0b539ec2c57bf48b872903e8d5ddf34b0def844 (patch)
treed0feeba7fa2fe5c3b4b33b828f96502f31c119ef /jjb
parent88812b12f218b23561f915168619e66b2b68df82 (diff)
[doctor] fix doctor profiling job
Doctor profiling jobs have to be executed on ool-* pods, since we need pre-deployed OpenStack for those jobs. This patch also: - merge job templates for verify job and profiling job - move experimental trigger to jjb/global/releng-macros.yml Change-Id: If0283a734bec77d3f1bbab72d169f44ff1cd1c99 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/doctor/doctor.yml107
-rw-r--r--jjb/global/releng-macros.yml24
2 files changed, 55 insertions, 76 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index ab9ef8f6c..62f89e686 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -24,10 +24,17 @@
- 'sample'
- 'congress'
+ task:
+ - verify:
+ profiler: 'none'
+ auto-trigger-name: 'doctor-verify'
+ - profiling:
+ profiler: 'poc'
+ auto-trigger-name: 'experimental'
+
jobs:
- 'doctor-verify-{stream}'
- - 'doctor-verify-{installer}-{inspector}-{stream}'
- - 'doctor-profiling-{stream}'
+ - 'doctor-{task}-{installer}-{inspector}-{stream}':
- job-template:
name: 'doctor-verify-{stream}'
@@ -71,7 +78,7 @@
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
- job-template:
- name: 'doctor-verify-{installer}-{inspector}-{stream}'
+ name: 'doctor-{task}-{installer}-{inspector}-{stream}'
node: '{slave-label}'
@@ -107,7 +114,7 @@
default: '{project}'
- string:
name: TESTCASE_OPTIONS
- default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor'
+ default: '-e INSPECTOR_TYPE={inspector} -e PROFILER_TYPE={profiler} -v $WORKSPACE:/home/opnfv/repos/doctor'
description: 'Addtional parameters specific to test case(s)'
# functest-parameter
- string:
@@ -131,32 +138,9 @@
- git-scm-gerrit
triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - patchset-created-event:
- exclude-drafts: 'false'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
- - draft-published-event
- - comment-added-contains-event:
- comment-contains-value: 'recheck'
- - comment-added-contains-event:
- comment-contains-value: 'reverify'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- file-paths:
- - compare-type: ANT
- pattern: 'tests/**'
- skip-vote:
- successful: true
- failed: true
- unstable: true
- notbuilt: true
+ - '{auto-trigger-name}':
+ project: '{project}'
+ branch: '{branch}'
builders:
- 'functest-suite-builder'
@@ -172,65 +156,36 @@
- archive:
artifacts: 'tests/*.log'
-- job-template:
- name: 'doctor-profiling-{stream}'
-
- disabled: '{obj:disabled}'
-
- parameters:
- - 'doctor-defaults':
- project: '{project}'
- branch: '{branch}'
- - string:
- name: PROFILER
- default: poc
- description: "Profiler to be used"
-
- scm:
- - git-scm-gerrit
-
- triggers:
- - 'experimental':
- project: '{project}'
- branch: '{branch}'
-
-#####################################
-# parameter macros
-#####################################
-# TODO(yujunz) replace common parameter in doctor-verify-{stream} with macro
-- parameter:
- name: 'doctor-defaults'
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
#####################################
# trigger macros
#####################################
-# TODO(yujunz) move to opnfv commom
- trigger:
- name: 'experimental'
+ name: 'doctor-verify'
triggers:
- gerrit:
server-name: 'gerrit.opnfv.org'
trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
- comment-added-contains-event:
- comment-contains-value: 'check-experimental'
+ comment-contains-value: 'reverify'
projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- file-paths:
- - compare-type: 'ANT'
- pattern: 'tests/**'
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: ANT
+ pattern: 'tests/**'
skip-vote:
successful: true
failed: true
unstable: true
notbuilt: true
- silent-start: true
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 10835f6a3..404c3dd69 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -96,6 +96,30 @@
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+- trigger:
+ name: 'experimental'
+ triggers:
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - comment-added-contains-event:
+ comment-contains-value: 'check-experimental'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: 'ANT'
+ pattern: 'tests/**'
+ skip-vote:
+ successful: true
+ failed: true
+ unstable: true
+ notbuilt: true
+ silent-start: true
+
- wrapper:
name: ssh-agent-wrapper
wrappers: