X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=caeb86c061d758e4755ae45d2d4672071905cb9f;hb=7ed988259acc8820b8aafdf96c7d0a2f28e6d33c;hp=a46f392c465e24fe72be3e8f5caaf0c9d3f949a2;hpb=b4263dde9bd10371e3f449ac204108bc7bdd7a09;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index a46f392c4..caeb86c06 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -25,6 +25,14 @@
             default: '{project}'
             description: "GERRIT_PROJECT parameter if not given by trigger"
 
+- parameter:
+    name: os-parameter
+    parameters:
+        - string:
+            name: OS
+            default: '{os}'
+            description: "OS parameter"
+
 - parameter:
     name: gerrit-refspec-parameter
     parameters:
@@ -40,6 +48,13 @@
             name: MAVEN_SELECTOR
             default: '{maven}'
             description: 'Maven selector to be used by shell scripts'
+- parameter:
+    name: repo-name-parameter
+    parameters:
+        - string:
+            name: REPO_NAME
+            default: '{repo-name}'
+            description: 'Name of repo to which to publish packaging'
 
 
 ##### SCMS
@@ -51,7 +66,7 @@
             url: '$GIT_BASE'
             refspec: ''
             branches:
-                - 'origin/${branch}'
+                - 'origin/{branch}'
             skip-tag: true
             wipe-workspace: true
 
@@ -67,6 +82,17 @@
             skip-tag: true
             choosing-strategy: '{choosing-strategy}'
 
+- scm:
+    name: zuul-trigger-scm
+    scm:
+      - git:
+          url: '$ZUUL_URL/$ZUUL_PROJECT'
+          refspec: '{refspec}'
+          branches:
+            - '{commit}'
+          skip-tag: true
+          wipe-workspace: true
+
 ###### WRAPPERS
 - wrapper:
     name: build-timeout
@@ -76,6 +102,98 @@
             timeout: 360
             fail: true
 
+- wrapper:
+    name: build-no-activity-timeout
+    wrappers:
+        - timeout:
+            type: no-activity
+            timeout: '{build-timeout}'
+            fail: true
+
+- wrapper:
+    # This wrapper is required for all jobs as it configures the wrappers
+    # needed by the fd.io infra.
+    name: fdio-infra-wrappers
+    wrappers:
+      - timeout:
+          type: absolute
+          timeout: '{build-timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+      - timestamps
+      - ssh-agent-credentials:
+          users:
+              - 'jenkins-gerrit-credentials'
+      - jclouds:
+          single-use: True
+
+###### TRIGGERS
+- trigger:
+    name: gerrit-trigger-patch-submitted
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            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-manually-triggered
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: '{comment-trigger-value}'
+            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: 'Primary'
+            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}'
+            # Force Jenkins always vote the values it should already have voted
+            # during the prior verify phase
+            override-votes: true
+            gerrit-build-started-verified-value: 1
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: 1
+            gerrit-build-unstable-verified-value: 1
+            gerrit-build-notbuilt-verified-value: 1
+            gerrit-build-started-codereview-value: 0
+            gerrit-build-successful-codereview-value: 0
+            gerrit-build-failed-codereview-value: 0
+            gerrit-build-unstable-codereview-value: 0
+            gerrit-build-notbuilt-codereview-value: 0
+
 # Publishers
 - publisher:
     name: archive-artifacts
@@ -121,6 +239,13 @@
                     healthy: 50
                     unhealthy: 40
 
+- publisher:
+    name: robot-report
+    publishers:
+        - robot:
+            output-path: '{output-path}'
+            other-files: ''
+
 ###### BUILDERS
 - builder:
     name: ci-management-check-unicode
@@ -137,4 +262,3 @@
                   variable: 'GLOBAL_SETTINGS_FILE'
                 - file-id: '{settings-file}'
                   variable: 'SETTINGS_FILE'
-