Use GIT_BASE to dynamically determine project and credentials to clone

[releng/builder.git] / jjb / releng-macros.yaml

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 673a74b4e4a197af307515bac9afb06908da5f27..6cac01cf13b5a9907c752bd26f6a43e6276f055a 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -1,5 +1,13 @@
 # OLD Releng macros
 
+- parameter:
+    name: project-parameter
+    parameters:
+        - string:
+            name: PROJECT
+            default: '{project}'
+            description: "JJB configured PROJECT parameter to identify an ODL Gerrit project"
+
 - parameter:
     name: gerrit-parameter
     parameters:
@@ -13,30 +21,37 @@
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '{scm-url}'
+            url: '$GIT_BASE'
             refspec: ''
             branches:
                 - 'origin/{branch}'
             skip-tag: true
+            wipe-workspace: true
 
 - scm:
     name: gerrit-trigger-scm
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '{scm-url}'
+            url: '$GIT_BASE'
             refspec: '{refspec}'
             branches:
                 - 'origin/$GERRIT_BRANCH'
             skip-tag: true
-            choosing-strategy: gerrit
+            choosing-strategy: '{choosing-strategy}'
 
 - trigger:
     name: gerrit-trigger-patch-submitted
     triggers:
         - gerrit:
-            trigger-on-patchset-uploaded-event: true
-            trigger-on-draft-published-event: true
+            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'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'
@@ -48,7 +63,10 @@
     name: gerrit-trigger-patch-merged
     triggers:
         - gerrit:
-            trigger-on-change-merged-event: true
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'