summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2018-03-02 01:08:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-02 01:08:05 +0000
commit007f30afb42750c9ea6caacb31ac0def3b18e1b6 (patch)
tree653b2c110e62e4a0979d6c5510be1659a05dc22d /jjb
parent6b68713ac730177080c7be7069b837e3fe2b7ed5 (diff)
parent6e3ad4c99263008c0740c70c692bd2ee397ee13d (diff)
Merge changes from topics 'decouple_verify_automate', 'simplify_automate_jjb'
* changes: decouple testresults verify job from automate job simplify automate jjb definition using releng_macro
Diffstat (limited to 'jjb')
-rw-r--r--jjb/releng/testresults-automate.yml (renamed from jjb/releng/automate.yml)69
-rw-r--r--jjb/releng/testresults-verify.yml46
2 files changed, 51 insertions, 64 deletions
diff --git a/jjb/releng/automate.yml b/jjb/releng/testresults-automate.yml
index 6bd952a1d..01fbe0c6d 100644
--- a/jjb/releng/automate.yml
+++ b/jjb/releng/testresults-automate.yml
@@ -1,6 +1,6 @@
---
- project:
- name: utils-automate
+ name: testresults-automate
stream:
- master:
branch: '{stream}'
@@ -17,7 +17,6 @@
jobs:
- '{module}-automate-{stream}'
- '{module}-automate-{phase}-{stream}'
- - '{module}-verify-{stream}'
project: 'releng-testresults'
@@ -53,53 +52,6 @@
send-to-individuals: true
- job-template:
- name: '{module}-verify-{stream}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
-
- scm:
- - 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: '{module}/**'
-
- builders:
- - shell: |
- cd {module}/
- tox
- if [ -e *.xml ];then
- cp *.xml $WORKSPACE
- fi
-
- publishers:
- - publish-coverage
- - email-jenkins-admins-on-failure
-
-- job-template:
name: '{module}-automate-{stream}'
project-type: multijob
@@ -135,21 +87,10 @@
fail: true
triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- file-paths:
- - compare-type: 'ANT'
- pattern: '{module}/**'
+ - gerrit-trigger-change-merged:
+ project: '**'
+ branch: '{branch}'
+ files: '{module}/**'
builders:
- description-setter:
diff --git a/jjb/releng/testresults-verify.yml b/jjb/releng/testresults-verify.yml
new file mode 100644
index 000000000..ba14a7c96
--- /dev/null
+++ b/jjb/releng/testresults-verify.yml
@@ -0,0 +1,46 @@
+---
+- project:
+ name: testresults-verify
+ stream:
+ - master:
+ branch: '{stream}'
+
+ module:
+ - 'testapi'
+ - 'reporting'
+
+ jobs:
+ - '{module}-verify-{stream}'
+
+ project: 'releng-testresults'
+
+- job-template:
+ name: '{module}-verify-{stream}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - git-scm-gerrit
+
+ triggers:
+ - gerrit-trigger-patchset-created:
+ server: 'gerrit.opnfv.org'
+ project: '**'
+ branch: '{branch}'
+ files: '{module}/**'
+
+ builders:
+ - shell: |
+ cd {module}/
+ tox
+ if [ -e *.xml ];then
+ cp *.xml $WORKSPACE
+ fi
+
+ publishers:
+ - publish-coverage
+ - email-jenkins-admins-on-failure