diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-06-09 23:18:12 +0200 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-06-09 23:18:12 +0200 |
commit | 5521fc27d877bbfa88a8f4c478938823c486c6ee (patch) | |
tree | ca04302d727f77d54d77e56efb76bf45a82dd307 /jjb | |
parent | 023f5bb56d0718fcd24b28e5d8f5059883e2ced2 (diff) |
Add trigger for merge+abandon and adapt jobs
Change-Id: I5b7fb39f8133e2c35e5db8d30a6e910f7ea82536
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 5 | ||||
-rw-r--r-- | jjb/ci-apps-verify/ci-apps-jjb.yaml | 5 | ||||
-rw-r--r-- | jjb/global-macros.yaml | 20 |
3 files changed, 22 insertions, 8 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 580081eb..e4eda721 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -581,10 +581,7 @@ - openstack: single-use: false triggers: - - gerrit-trigger-patch-merged: - name: 'AGL/{project}' - branch: '**/**/**' - - gerrit-trigger-patch-abandoned: + - gerrit-trigger-silent-patch-merged-abandoned: name: 'AGL/{project}' branch: '**/**/**' builders: diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 14d311e9..4362916a 100644 --- a/jjb/ci-apps-verify/ci-apps-jjb.yaml +++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml @@ -538,10 +538,7 @@ - openstack: single-use: false triggers: - - gerrit-trigger-patch-merged: - name: 'apps/{project}' - branch: '**/**/**' - - gerrit-trigger-patch-abandoned: + - gerrit-trigger-silent-patch-merged-abandoned: name: 'apps/{project}' branch: '**/**/**' builders: diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 806e854c..b84eedf6 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -335,6 +335,26 @@ silent-start: 'true' - trigger: + name: gerrit-trigger-silent-patch-merged-abandoned + triggers: + - gerrit: + server-name: 'gerrit.automotivelinux.org' + trigger-on: + - change-merged-event + - change-abandoned-event + - comment-added-contains-event: + comment-contains-value: 'remove-artifacts' + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + silent-start: 'true' + +- trigger: name: gerrit-trigger-tag triggers: - gerrit: |