From: Tim Johnson <tijohnson@linuxfoundation.org>
Date: Fri, 20 Sep 2019 22:21:31 +0000 (-0700)
Subject: Global JJB Fatal Shellcheck Errors
X-Git-Tag: v0.44.0~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F61803%2F1;p=releng%2Fglobal-jjb.git

Global JJB Fatal Shellcheck Errors

Fix all tox warnings/errors

Issue: RELENG-1214
Change-Id: Ic4c1743828dbe4a230eaf2950c03d8c7fbfaf458
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>
---

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index 4ef52ad7..3df7f8d3 100644
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -227,8 +227,8 @@ Jenkins configure -> Global properties -> Environment variables
 
 .. note::
 
-    These also need to be added to your global-vars-$SILO.sh
-    or they will be overwritten.
+    Add these variables to your global-vars-$SILO.sh file or they will
+    be overwritten.
 
 Jenkins configure -> Managed Files -> Add a New Config -> Custom File
 
diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index dfacdeb7..b015271c 100644
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -44,8 +44,8 @@ packer.io build -color=false \
 # Extract image name from log and store value in the downstream job
 if [[ ${UPDATE_CLOUD_IMAGE} ]]; then
 
-    NEW_IMAGE_NAME=$(grep -P '(\s+.*image: )(ZZCI\s+.*\d+-\d+\.\d+)' "$PACKER_BUILD_LOG" \
-                  | awk -F': ' '{print $4}')\")
+    NEW_IMAGE_NAME=$(grep -P '(\s+.*image: )(ZZCI\s+.*\d+-\d+\.\d+)' \
+                          "$PACKER_BUILD_LOG" | awk -F': ' '{print $4}')
 
     echo NEW_IMAGE_NAME="$NEW_IMAGE_NAME" >> "$WORKSPACE/variables.prop"
     echo "NEW_IMAGE_NAME: ${NEW_IMAGE_NAME}"