X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fglobal-macros.yaml;h=92c881fb9a6e1661bf5ec330490ce8749624a4e9;hb=c323e77475015fa055e67138fb63e0baaf2af747;hp=e1b1efa3427552cd1b048a8e871febbe7d043de9;hpb=4e33c66bc42c8be83c5e2425da74947b9f53f32a;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index e1b1efa34..92c881fb9 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -89,6 +89,46 @@
             default: '{stream}'
             description: "Stream job parameter to be used in shell scripts."
 
+- parameter:
+    name: topo-parameter
+    parameters:
+        - string:
+            name: TOPO
+            default: '{topo}'
+            description: "Topology parameter"
+
+- parameter:
+    name: arch-parameter
+    parameters:
+        - string:
+            name: ARCH
+            default: '{arch}'
+            description: "Architecture parameter"
+
+- parameter:
+    name: gerrit-event-type-parameter
+    parameters:
+        - string:
+            name: GERRIT_EVENT_TYPE
+            default: ''
+            description: "GERRIT_EVENT_TYPE parameter not given by trigger"
+
+- parameter:
+    name: gerrit-event-comment-text-parameter
+    parameters:
+        - string:
+            name: GERRIT_EVENT_COMMENT_TEXT
+            default: ''
+            description: "GERRIT_EVENT_COMMENT_TEXT parameter not given by trigger"
+
+- parameter:
+    name: gerrit-csit-refspec-parameter
+    parameters:
+        - string:
+            name: CSIT_REF
+            default: ''
+            description: "GERRIT_REFSPEC parameter to override separately cloned CSIT repository, leave empty for autodetection / no override."
+            # FIXME: Wrap long lines.
 
 ##### SCMS
 - scm:
@@ -115,6 +155,20 @@
             skip-tag: true
             choosing-strategy: '{choosing-strategy}'
 
+- scm:
+    name: gerrit-trigger-scm-recursive
+    scm:
+        - git:
+            credentials-id: '{credentials-id}'
+            url: '$GIT_BASE'
+            refspec: '{refspec}'
+            branches:
+                - 'origin/$GERRIT_BRANCH'
+            skip-tag: true
+            choosing-strategy: '{choosing-strategy}'
+            submodule:
+              recursive: '{submodule-recursive}'
+
 - scm:
     name: zuul-trigger-scm
     scm:
@@ -179,7 +233,7 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'false'
                 - draft-published-event
@@ -201,7 +255,7 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'true'
                 - draft-published-event
@@ -240,7 +294,7 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'true'
                 - draft-published-event