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

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index caeb86c06..8601fa8d8 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -48,6 +48,15 @@
             name: MAVEN_SELECTOR
             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:
@@ -56,6 +65,22 @@
             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:
@@ -103,12 +128,21 @@
             fail: true
 
 - wrapper:
-    name: build-no-activity-timeout
+    # 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
+      - timeout:
+          type: no-activity
+          timeout: '{build-timeout}'
+          fail: true
+      - timestamps
+      - ssh-agent-credentials:
+          users:
+            - 'jenkins-gerrit-credentials'
+      - jclouds:
+          single-use: True
+      - openstack:
+          single-use: True
 
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
@@ -126,6 +160,8 @@
               - 'jenkins-gerrit-credentials'
       - jclouds:
           single-use: True
+      - openstack:
+          single-use: True
 
 ###### TRIGGERS
 - trigger: