Migrate to Zuul configuration

[ci-management.git] / jjb / global-macros.yaml

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index b1e0283..a46f392 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -33,6 +33,15 @@
             default: '{refspec}'
             description: "GERRIT_REFSPEC parameter not given by trigger"
 
+- parameter:
+    name: maven-project-parameter
+    parameters:
+        - string:
+            name: MAVEN_SELECTOR
+            default: '{maven}'
+            description: 'Maven selector to be used by shell scripts'
+
+
 ##### SCMS
 - scm:
     name: git-scm
@@ -67,51 +76,12 @@
             timeout: 360
             fail: true
 
-###### TRIGGERS
-- trigger:
-    name: gerrit-trigger-patch-submitted
-    triggers:
-        - gerrit:
-            server-name: 'Default'
-            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'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{name}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-
-- trigger:
-    name: gerrit-trigger-patch-merged
-    triggers:
-        - gerrit:
-            server-name: 'Default'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{name}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-
 # Publishers
 - publisher:
     name: archive-artifacts
     publishers:
         - archive:
-            articacts: '{artifacts}'
+            artifacts: '{artifacts}'
             allow-empty: true
             fingerprint: true
             latest-only: true
@@ -163,7 +133,7 @@
     builders:
         - config-file-provider:
             files:
-                - file-id: '{global-settings}'
+                - file-id: '{global-settings-file}'
                   variable: 'GLOBAL_SETTINGS_FILE'
                 - file-id: '{settings-file}'
                   variable: 'SETTINGS_FILE'