X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpacker-build.sh;h=b015271c45756154e08c50bc06a086a8548fc7ce;hb=32fc471adb587ff7ee252ebd1b1e6664119185ea;hp=177bb1cb04d6c0f18a3be491b44640f2997ff031;hpb=32872573cb431a8479e75d159350b8184bb9d62e;p=releng%2Fglobal-jjb.git

diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index 177bb1cb..b015271c 100644
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -22,20 +22,40 @@ PACKER_BUILD_LOG="$PACKER_LOGS_DIR/packer-build.log"
 mkdir -p "$PACKER_LOGS_DIR"
 export PATH="${WORKSPACE}/bin:$PATH"
 
+cd packer
+
 # 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 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"
 
+# Extract image name from log and store value in the downstream job
+if [[ ${UPDATE_CLOUD_IMAGE} ]]; then
+
+    NEW_IMAGE_NAME=$(grep -P '(\s+.*image: )(ZZCI\s+.*\d+-\d+\.\d+)' \
+                          "$PACKER_BUILD_LOG" | awk -F': ' '{print $4}')
+
+    echo NEW_IMAGE_NAME="$NEW_IMAGE_NAME" >> "$WORKSPACE/variables.prop"
+    echo "NEW_IMAGE_NAME: ${NEW_IMAGE_NAME}"
+
+    # Copy variables.prop to variables.jenkins-trigger so that the end of build
+    # trigger can pick up the file as input for triggering downstream jobs.
+    # Dont tigger downstream job when UPDATE_CLOUD_IMAGE is set to 'false'
+    cp $WORKSPACE/variables.prop $WORKSPACE/variables.jenkins-trigger
+fi
+
 # Retrive the list of cloud providers
 mapfile -t clouds < <(jq -r '.builders[].name' "templates/$PACKER_TEMPLATE.json")