Rename -merge to -remove-artifacts and trigger also when change is abandoned

Change-Id: I0c4dde2c8ce02d2e0a89449ab3a12e7a84bff762
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index c1eb5bc..580081e 100644 (file)
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -24,7 +24,7 @@
       # - ci-platform-{project}-verify-CIBT-start            #unused
       - ci-platform-{project}-verify-CIBT-{machine}
       - ci-platform-{project}-verify-CIBT-finish-success
-      - ci-platform-{project}-merge
+      - ci-platform-{project}-remove-artifacts
 
 
 ################################################################################################################################################################
@@ -543,10 +543,10 @@
 
 ################################################################################
 ################################################################################
-# -merge = merge, remove artifacts and later trigger sstate refresh
+# -remove-artifacts = merge/abandon, remove artifacts and later trigger sstate
 ################################################################################
 - job-template:
-    name: 'ci-platform-{project}-merge'
+    name: 'ci-platform-{project}-remove-artifacts'
     project-type: freestyle
     concurrent: true
     node: control-slave
@@ -584,6 +584,9 @@
       - gerrit-trigger-patch-merged:
           name: 'AGL/{project}'
           branch: '**/**/**'
+      - gerrit-trigger-patch-abandoned:
+          name: 'AGL/{project}'
+          branch: '**/**/**'
     builders:
       - shell:
           !include-raw-escape:

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 4bb2563..806e854 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -262,6 +262,22 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
 
+- trigger:
+    name: gerrit-trigger-patch-abandoned
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.automotivelinux.org'
+          trigger-on:
+            - change-abandoned-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remove-artifacts'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{name}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+
 - trigger:
     name: gerrit-trigger-silent-patch-submitted
     triggers: