summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Phelps <jphelps@linuxfoundation.org>2018-08-27 20:55:00 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-27 20:55:00 +0000
commit8201e216d92935e5fb7893a2dacf0ab9e3e3cb37 (patch)
tree93d647f90588cc12b775a564f5641b2d76627fcb
parente0e620cb30877303308d39795260e558b3086167 (diff)
parentd73b214e171b27445d92c22167697e10c79a63c1 (diff)
Merge "Make custom helm verify and merge triggers"
-rw-r--r--jjb/global-macros.yaml42
-rw-r--r--jjb/global-templates-helm.yaml14
2 files changed, 44 insertions, 12 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 55711f086..d32e53d7b 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -392,6 +392,48 @@
pattern: '{files}'
- trigger:
+ name: gerrit-trigger-helm-patch-submitted
+ triggers:
+ - gerrit:
+ server-name: '{server}'
+ 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: '^verify-helm$'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: 'ANT'
+ pattern: '{files}'
+
+- trigger:
+ name: gerrit-trigger-helm-patch-merged
+ triggers:
+ - gerrit:
+ server-name: '{server}'
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: '^remerge-helm$'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: 'ANT'
+ pattern: '{files}'
+
+- trigger:
name: gerrit-trigger-release-manually
triggers:
- gerrit:
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index d7cc056e5..d412d9ba3 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -59,16 +59,12 @@
submodule-recursive: '{submodule-recursive}'
triggers:
- - gerrit-trigger-patch-submitted:
+ - gerrit-trigger-helm-patch-submitted:
status-context: '{project}-Helm-Verify'
server: '{server-name}'
project: '{project}'
branch: '{branch}'
files: '{files}'
- - gerrit:
- trigger-on:
- - comment-added-contains-event:
- comment-contains-value: '^verify-helm$'
builders:
- shell: '{obj:pre_build_script}'
@@ -87,17 +83,11 @@
submodule-recursive: '{submodule-recursive}'
triggers:
- - gerrit-trigger-patch-merged:
+ - gerrit-trigger-helm-patch-merged:
server: '{server-name}'
project: '{project}'
branch: '{branch}'
files: '{files}'
- - pollscm:
- cron: ''
- - gerrit:
- trigger-on:
- - comment-added-contains-event:
- comment-contains-value: '^remerge-helm$'
builders:
- lf-provide-maven-settings: