From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 1 Feb 2018 18:50:47 +0000 (-0500)
Subject: Fix local platform file path
X-Git-Tag: v0.16.0~13
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F8637%2F2;p=releng%2Fglobal-jjb.git

Fix local platform file path

The local vars path is incorrect in the if-statement but
correct in the declaration below it. Update to match.

Change-Id: I1e8ec19adf842668fb46e54aaf8beebfcef9c34d
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index d3e306f3..34c4014a 100644
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -22,13 +22,14 @@ PACKER_BUILD_LOG="$PACKER_LOGS_DIR/packer-build.log"
 mkdir -p "$PACKER_LOGS_DIR"
 export PATH="${WORKSPACE}/bin:$PATH"
 
+cd packer || exit
+
 # Prioritize the project's own version of vars if available
 platform_file="common-packer/vars/$PACKER_PLATFORM.json"
-if [ -f "$PACKER_PLATFORM" ]; then
+if [ -f "vars/$PACKER_PLATFORM.json" ]; then
     platform_file="vars/$PACKER_PLATFORM.json"
 fi
 
-cd packer
 export PACKER_LOG="yes"
 export PACKER_LOG_PATH="$PACKER_BUILD_LOG"
 packer.io build -color=false \