From a4baa1b17e527a9d586d44928773712ee5cc0db6 Mon Sep 17 00:00:00 2001 From: Tim Johnson Date: Fri, 20 Sep 2019 15:21:31 -0700 Subject: [PATCH] Global JJB Fatal Shellcheck Errors Fix all tox warnings/errors Issue: RELENG-1214 Change-Id: Ic4c1743828dbe4a230eaf2950c03d8c7fbfaf458 Signed-off-by: Tim Johnson --- docs/jjb/lf-release-jobs.rst | 4 ++-- shell/packer-build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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}" -- 2.16.6