From c91698f989830021fab3521562380e0421d0c547 Mon Sep 17 00:00:00 2001
From: dongwenjuan <dong.wenjuan@zte.com.cn>
Date: Fri, 22 Dec 2017 15:59:41 +0800
Subject: add pep8 check task for doctor
Change-Id: Ibd595748910b143ae3e9373bccf4b4e6b54dd931
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
---
jjb/doctor/doctor.yml | 49 +++++++++++++++++--------------------------------
1 file changed, 17 insertions(+), 32 deletions(-)
(limited to 'jjb')
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index e0de9aa2e..561240158 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -38,10 +38,6 @@
task:
- verify:
auto-trigger-name: 'doctor-verify'
- is-python: false
- - python-verify:
- auto-trigger-name: 'doctor-verify'
- is-python: true
exclude:
- installer: 'apex'
@@ -70,27 +66,11 @@
- 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: 'doctor_tests/**'
+ - 'doctor-verify':
+ project: '{project}'
+ branch: '{branch}'
+ files: 'doctor_tests/**'
+ is-skip-vote: false
builders:
- shell: |
@@ -133,7 +113,6 @@
publishers:
- 'doctor-verify-unit-test-publishers-macro'
-
- job-template:
name: 'doctor-{task}-{inspector}-{stream}'
@@ -172,7 +151,7 @@
- string:
name: TESTCASE_OPTIONS
# yamllint disable rule:line-length
- default: '-e INSPECTOR_TYPE={inspector} -e PYTHON_ENABLE={is-python} -v $WORKSPACE:/home/opnfv/repos/doctor'
+ default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor'
# yamllint enable rule:line-length
description: 'Addtional parameters specific to test case(s)'
# functest-parameter
@@ -203,6 +182,7 @@
project: '{project}'
branch: '{branch}'
files: 'doctor_tests/**'
+ is-skip-vote: true
builders:
- shell: |
@@ -283,7 +263,8 @@
- builder:
name: 'doctor-verify-unit-test-builders-macro'
builders:
- - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
+ - shell: "tox -e pep8"
+
- builder:
name: 'doctor-verify-installer-inspector-builders-macro'
builders:
@@ -320,10 +301,14 @@
- archive:
artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
- email-jenkins-admins-on-failure
+
- publisher:
name: 'doctor-verify-unit-test-publishers-macro'
publishers:
- email-jenkins-admins-on-failure
+ - archive:
+ artifacts: '.tox/'
+
#####################################
# trigger macros
@@ -353,7 +338,7 @@
- compare-type: ANT
pattern: '{files}'
skip-vote:
- successful: true
- failed: true
- unstable: true
- notbuilt: true
+ successful: '{is-skip-vote}'
+ failed: '{is-skip-vote}'
+ unstable: '{is-skip-vote}'
+ notbuilt: '{is-skip-vote}'
--
cgit