Refactor: Simplify and improve readability

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

diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index 4cb3df3..b85c31a 100644 (file)
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -21,7 +21,6 @@ PACKER_LOGS_DIR="$WORKSPACE/archives/packer"
 PACKER_BUILD_LOG="$PACKER_LOGS_DIR/packer-build.log"
 mkdir -p "$PACKER_LOGS_DIR"
 export PATH="${WORKSPACE}/bin:$PATH"
-export PACKER_BUILDER=${PACKER_BUILDER:-openstack}
 
 cd packer
 
@@ -54,8 +53,9 @@ then
 elif [[ "${GIT_BASE:-}" =~ https://github.com ]]; then
     LAST_CHANGE_SHA=$(git log --no-merges -1 --format=%H)
     API_BASE=$(echo "$GIT_BASE" | sed -E 's#(www.)?github.com#api.github.com/repos#')
-    STATUS=$(curl "${API_BASE}/statuses/${LAST_CHANGE_SHA}" \
-        | jq ".[] | select(.state == \"success\" and .context == \"Packer ${PACKER_PLATFORM}-${PACKER_TEMPLATE} Verify Build\")")
+    CONTEXT_VALUE="\"Packer ${PACKER_PLATFORM}-${PACKER_TEMPLATE} Verify Build\""
+    JQ_QUERY=".[] | select(.state == \"success\" and .context == ${CONTEXT_VALUE})"
+    STATUS=$(curl "${API_BASE}/statuses/${LAST_CHANGE_SHA}" | jq "${JQ_QUERY}")
     if [[ -n ${STATUS} ]]; then
         echo "Build already successful for this patch set. Skipping merge build..."
         exit
@@ -64,6 +64,7 @@ fi
 set +x
 
 packer.io build -color=false \
+    -only "${PACKER_BUILDER}" \
     -var-file="$CLOUDENV" \
     -var-file="$platform_file" \
     "templates/$PACKER_TEMPLATE.json"