X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=16cd33c6d4e166e0d1a6f7650294f657abd17cc6;hb=50b5d5ad077ccc6c522d9ae8d844ed02e9c71d71;hp=801cf97de83e52b71abd870f867769872ea74e0b;hpb=f0dae8046088b145652b9da6a15068b8c99ced6c;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 801cf97d..16cd33c6 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -181,7 +181,7 @@
               variable: SIGUL_PASSWORD
             - file-id: sigul-pki
               variable: SIGUL_PKI
-      - shell: !include-raw-escape: ../shell/sigul-configuration.sh
+      - shell: !include-raw: ../shell/sigul-configuration.sh
 
 - builder:
     name: lf-pip-install
@@ -211,7 +211,7 @@
     name: lf-provide-sigul-configuration-cleanup
     # Clear sigul configuration files after we're done using them
     builders:
-      - shell: !include-raw-escape: ../shell/sigul-configuration-cleanup.sh
+      - shell: !include-raw: ../shell/sigul-configuration-cleanup.sh
 
 - builder:
     name: lf-rtd-trigger-build
@@ -235,8 +235,8 @@
     name: lf-sigul-install
     # Requires that Jenkins be configured with SIGUL_BRIDGE_IP as a global
     # Environment variable
-    builder:
-      - shell: !include-raw-escape: ../shell/sigul-install.sh
+    builders:
+      - shell: !include-raw: ../shell/sigul-install.sh
 
 - builder:
     name: lf-infra-provide-docker-cleanup
@@ -252,6 +252,15 @@
 # PARAMETERS #
 ##############
 
+- parameter:
+    name: lf-clm-parameters
+    parameters:
+      - string:
+          name: NEXUS_IQ_STAGE
+          default: '{nexus-iq-stage}'
+          description: |
+              Stage the policy evaluation will be run against on the Nexus IQ Server.
+
 - parameter:
     name: lf-cmake-parameters
     # Parameters useful in CMake builds.
@@ -301,12 +310,6 @@
           # yamllint disable-line rule:line-length
           default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{mvn-version}/bin/mvn'
           description: 'Maven selector to be used by shell scripts'
-      - string:
-          name: STAGING_PROFILE_ID
-          default: '{staging-profile-id}'
-          description: |
-              Nexus staging profile ID.
-
 
 - parameter:
     name: lf-infra-openstack-parameters