X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=ba0d1a59659428455d35925f03c080544f6d0dca;hb=2d0e270bbdc6a0933cf836123cb1ee88f105ddd7;hp=8e7878b5ee9990193431e20a1e9684bd124d20d3;hpb=5acae471b6369b93fec3c755937ed1225df7b330;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 8e7878b5e..ba0d1a596 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:
@@ -41,6 +49,38 @@
             default: '{maven}'
             description: 'Maven selector to be used by shell scripts'
 
+- parameter:
+    name: maven-exec
+    parameters:
+      - string:
+          name: MVN
+          default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn'
+          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'
+
+- parameter:
+    name: compiler-parameter
+    parameters:
+        - string:
+            name: CC
+            default: '{cc}'
+            description: "CC parameter, can be gnu or clang"
+
+- parameter:
+    name: is-csit-vpp-job-parameter
+    parameters:
+        - string:
+            name: IS_CSIT_VPP_JOB
+            default: '{is-csit-vpp-job}'
+            description: "Parameter is True if this is a CSIT vpp job."
+
 
 ##### SCMS
 - scm:
@@ -87,12 +127,44 @@
             timeout: 360
             fail: true
 
+- wrapper:
+    # This wrapper is used for all jobs that require no-activity timeouts
+    name: fdio-infra-wrappers-non-activity-timeout
+    wrappers:
+      - timeout:
+          type: no-activity
+          timeout: '{build-timeout}'
+          fail: true
+      - timestamps
+      - ssh-agent-credentials:
+          users:
+            - 'jenkins-gerrit-credentials'
+      - jclouds:
+          single-use: 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'
@@ -114,7 +186,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}'
@@ -129,7 +201,7 @@
     name: gerrit-trigger-patch-merged
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -140,6 +212,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:
@@ -209,4 +294,3 @@
                   variable: 'GLOBAL_SETTINGS_FILE'
                 - file-id: '{settings-file}'
                   variable: 'SETTINGS_FILE'
-