Fix github-maven-merge scm config

[releng/global-jjb.git] / shell / packer-build.sh

diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index 714cd33..1caca8e 100644 (file)
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -22,16 +22,27 @@ PACKER_BUILD_LOG="$PACKER_LOGS_DIR/packer-build.log"
 mkdir -p "$PACKER_LOGS_DIR"
 export PATH="${WORKSPACE}/bin:$PATH"
 
-cd packer
-export PACKER_LOG="yes" && \
-export PACKER_LOG_PATH="$PACKER_BUILD_LOG" && \
-                 packer.io build -color=false \
-                        -var-file="$CLOUDENV" \
-                        -var-file="../packer/vars/$PACKER_PLATFORM.json" \
-                        "../packer/templates/$PACKER_TEMPLATE.json"
+cd packer || exit
+
+# Prioritize the project's own version of vars if available
+platform_file="common-packer/vars/$PACKER_PLATFORM.json"
+if [ -f "vars/$PACKER_PLATFORM.json" ]; then
+    platform_file="vars/$PACKER_PLATFORM.json"
+fi
+
+export PACKER_LOG="yes"
+export PACKER_LOG_PATH="$PACKER_BUILD_LOG"
+packer.io validate \
+    -var-file="$CLOUDENV" \
+    -var-file="$platform_file" \
+    "templates/$PACKER_TEMPLATE.json"
+packer.io build -color=false \
+    -var-file="$CLOUDENV" \
+    -var-file="$platform_file" \
+    "templates/$PACKER_TEMPLATE.json"
 
 # Retrive the list of cloud providers
-clouds=($(jq -r '.builders[].name' "../packer/templates/$PACKER_TEMPLATE.json"))
+mapfile -t clouds < <(jq -r '.builders[].name' "templates/$PACKER_TEMPLATE.json")
 
 # Split public/private clouds logs
 for cloud in "${clouds[@]}"; do