Fix local platform file path 37/8637/2
authorThanh Ha <thanh.ha@linuxfoundation.org>
Thu, 1 Feb 2018 18:50:47 +0000 (13:50 -0500)
committerThanh Ha <thanh.ha@linuxfoundation.org>
Thu, 1 Feb 2018 18:52:30 +0000 (13:52 -0500)
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>
shell/packer-build.sh

index d3e306f..34c4014 100644 (file)
@@ -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 \