From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Mon, 20 Aug 2018 15:18:30 +0000 (+0000)
Subject: Merge "Document the jjb-version variable"
X-Git-Tag: v0.24.0~13
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=05d39da965b282ab4d950fe519834ad31996286a;hp=7255eaaa4f73e7867f0a64199b5b45cb92e8fbfc;p=releng%2Fglobal-jjb.git

Merge "Document the jjb-version variable"
---

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index bc1ce586..6f77339f 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
diff --git a/shell/sigul-configuration.sh b/shell/sigul-configuration.sh
index bdc4de67..c063b18b 100644
--- a/shell/sigul-configuration.sh
+++ b/shell/sigul-configuration.sh
@@ -11,7 +11,7 @@
 echo "---> sigul-configuration.sh"
 
 # Ensure we fail the job if any steps fail.
-set -eu -o pipefail
+set -e -o pipefail
 
 # Sigul pki configuration is designed to live in ${HOME}/sigul
 cd "${HOME}"
@@ -23,4 +23,3 @@ tar Jxf sigul.tar.xz
 
 # Any future use of $SIGUL_PASSWORD needs to have it null terminated
 sed -i 's/$/\x0/' "${SIGUL_PASSWORD}"
-
diff --git a/shell/sigul-install.sh b/shell/sigul-install.sh
index 5d015ffd..8573154e 100644
--- a/shell/sigul-install.sh
+++ b/shell/sigul-install.sh
@@ -11,7 +11,7 @@
 echo "---> sigul-install.sh"
 
 # Ensure we fail the job if any steps fail.
-set -eu -o pipefail
+set -e -o pipefail
 
 # Setup sigul RPM repo
 echo "[fedora-infra-sigul]