Merge "Convert rpm_dpdk to be Packer compliant"

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

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 0abe9d2..8601fa8 100644 (file)
--- 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:
@@ -116,6 +141,8 @@
             - 'jenkins-gerrit-credentials'
       - jclouds:
           single-use: True
+      - openstack:
+          single-use: True
 
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
@@ -133,6 +160,8 @@
               - 'jenkins-gerrit-credentials'
       - jclouds:
           single-use: True
+      - openstack:
+          single-use: True
 
 ###### TRIGGERS
 - trigger: