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

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 6dc0e0fcb..caeb86c06 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -48,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
@@ -95,12 +102,37 @@
             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: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -122,7 +154,7 @@
     name: gerrit-trigger-manually-triggered
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: '{comment-trigger-value}'
@@ -137,7 +169,7 @@
     name: gerrit-trigger-patch-merged
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -148,6 +180,19 @@
                   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:
@@ -217,4 +262,3 @@
                   variable: 'GLOBAL_SETTINGS_FILE'
                 - file-id: '{settings-file}'
                   variable: 'SETTINGS_FILE'
-