summaryrefslogtreecommitdiffstats
path: root/jjb/releng
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2018-02-28 16:31:20 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2018-02-28 16:35:15 +0800
commit35692a3184704c93549a953b3b33e3b5fb119060 (patch)
treec2b59b65f2b4a2873b1913dde62b6bd20b01a10e /jjb/releng
parent146464fc62732f55904b74e5a2327fd2f257114f (diff)
simplify automate jjb definition using releng_macro
1. leveraging macro gerrit-trigger-patchset-created 2. leveraging macro gerrit-trigger-change-merged 3. rename automate to testresults-automate Change-Id: I3dfee8dad28db7e818b912fed6d65b60b3f96391 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'jjb/releng')
-rw-r--r--jjb/releng/testresults-automate.yml (renamed from jjb/releng/automate.yml)47
1 files changed, 10 insertions, 37 deletions
diff --git a/jjb/releng/automate.yml b/jjb/releng/testresults-automate.yml
index 6bd952a1d..c491e01c5 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}'
@@ -65,27 +65,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: '{module}/**'
+ - gerrit-trigger-patchset-created:
+ server: 'gerrit.opnfv.org'
+ project: '**'
+ branch: '{branch}'
+ files: '{module}/**'
builders:
- shell: |
@@ -135,21 +119,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: