X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpacker-build.sh;h=34c4014aa2ae35efcd7267be5fe245a51b0fa26d;hb=6eefde1f463638b5021c2ec96eb67a017d379f1f;hp=177bb1cb04d6c0f18a3be491b44640f2997ff031;hpb=7ce2809af0e22181a0e399311f879f34f2392e32;p=releng%2Fglobal-jjb.git diff --git a/shell/packer-build.sh b/shell/packer-build.sh index 177bb1cb..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="vars/$PACKER_PLATFORM.json" -if [ -f "$PACKER_PLATFORM" ]; then +platform_file="common-packer/vars/$PACKER_PLATFORM.json" +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 \