Help debugging issues

builder/build-image.sh

@@ -37,22 +37,36 @@ apt-get update && apt-get install -y packer
 packer plugins install github.com/hashicorp/qemu
 packer plugins install github.com/hashicorp/ansible
 
-# do the build
-if tools/build.sh "$IMAGE" >/var/log/image-build.log 2>&1; then
-    # compress the resulting image
-    QEMU_SOURCE_ID=$(hcl2tojson "$IMAGE" | jq -r '.source[0].qemu | keys[]')
-    VM_NAME=$(hcl2tojson "$IMAGE" | jq -r '.source[0].qemu.'"$QEMU_SOURCE_ID"'.vm_name')
-    QCOW_FILE="$VM_NAME.qcow2"
-    builder/refresh.sh vo.access.egi.eu "$(cat /var/tmp/egi/.refresh_token)" images
-    OS_TOKEN="$(yq -r '.clouds.images.auth.token' /etc/openstack/clouds.yaml)"
-    OUTPUT_DIR="$(dirname "$IMAGE")/output-$QEMU_SOURCE_ID"
-    cd "$OUTPUT_DIR"
-    qemu-img convert -O qcow2 -c "$VM_NAME" "$QCOW_FILE"
-    openstack --os-cloud images --os-token "$OS_TOKEN" \
-        object create egi_endorsed_vas "$QCOW_FILE"
-    ls -lh "$QCOW_FILE"
-    SHA="$(sha512sum -z "$QCOW_FILE" | cut -f1 -d" ")"
-    echo "SUCCESSFUL BUILD - $QCOW_FILE - $SHA" >>/var/log/image-build.log
+QEMU_SOURCE_ID=$(hcl2tojson "$IMAGE" | jq -r '.source[0].qemu | keys[]')
+VM_NAME=$(hcl2tojson "$IMAGE" \
+	| jq -r '.source[0].qemu.'"$QEMU_SOURCE_ID"'.vm_name')
+QCOW_FILE="$VM_NAME.qcow2"
+
+# Check if the image is already there
+builder/refresh.sh vo.access.egi.eu "$(cat /var/tmp/egi/.refresh_token)" images
+OS_TOKEN="$(yq -r '.clouds.images.auth.token' /etc/openstack/clouds.yaml)"
+if openstack --os-cloud images --os-token "$OS_TOKEN" \
+	object show egi_endorsed_vas \
+	"$QCOW_FILE"  > /dev/null ; then
+	# skip
+	echo "Skipped build as image is already uploaded" >>/var/log/image-build.log
+else
+	if tools/build.sh "$IMAGE" >/var/log/image-build.log 2>&1; then
+	    # compress the resulting image
+	    QEMU_SOURCE_ID=$(hcl2tojson "$IMAGE" | jq -r '.source[0].qemu | keys[]')
+	    VM_NAME=$(hcl2tojson "$IMAGE" | jq -r '.source[0].qemu.'"$QEMU_SOURCE_ID"'.vm_name')
+	    QCOW_FILE="$VM_NAME.qcow2"
+	    builder/refresh.sh vo.access.egi.eu "$(cat /var/tmp/egi/.refresh_token)" images
+	    OS_TOKEN="$(yq -r '.clouds.images.auth.token' /etc/openstack/clouds.yaml)"
+	    OUTPUT_DIR="$(dirname "$IMAGE")/output-$QEMU_SOURCE_ID"
+	    cd "$OUTPUT_DIR"
+	    qemu-img convert -O qcow2 -c "$VM_NAME" "$QCOW_FILE"
+	    openstack --os-cloud images --os-token "$OS_TOKEN" \
+		object create egi_endorsed_vas "$QCOW_FILE"
+	    ls -lh "$QCOW_FILE"
+	    SHA="$(sha512sum -z "$QCOW_FILE" | cut -f1 -d" ")"
+	    echo "SUCCESSFUL BUILD - $QCOW_FILE - $SHA" >>/var/log/image-build.log
+	fi
 fi
 
 echo "BUILD ENDED" >>/var/log/image-build.log

builder/refresh.sh

@@ -5,7 +5,7 @@
 # 2 --> the refresh token
 # 3 --> the list of clouds to update
 #
-# Will throw the OIDC TOKEN to output!
+# Will throw the OIDC TOKEN to output if $GITHUB_ACTION is defined!
 
 set -e
 
@@ -27,12 +27,13 @@ SCOPE="$SCOPE%20eduperson_entitlement:urn:mace:egi.eu:group:$VO:role=member#aai.
 OIDC_TOKEN=$(curl -X POST "https://aai.egi.eu/auth/realms/egi/protocol/openid-connect/token" \
                   -d "grant_type=refresh_token&client_id=token-portal&scope=$SCOPE&refresh_token=$REFRESH_TOKEN" \
                   | jq -r ".access_token")
-echo "::add-mask::$OIDC_TOKEN"
+[ -n "$GITHUB_ACTION" ] &&  echo "::add-mask::$OIDC_TOKEN"
 for cloud in "$@" ; do
 	SITE="$(yq -r ".clouds.$cloud.site" $CLOUDS_YAML)"
 	VO="$(yq -r ".clouds.$cloud.vo" $CLOUDS_YAML)"
 	OS_TOKEN="$(fedcloud openstack token issue --oidc-access-token "$OIDC_TOKEN" \
         			--site "$SITE" --vo "$VO" -j | jq -r '.[0].Result.id')"
+	[ -n "$GITHUB_ACTION" ] &&  echo "::add-mask::$OIDC_TOKEN"
 	echo "::add-mask::$OS_TOKEN"
 	yq -y -i '.clouds.'"$cloud"'.auth.token="'"$OS_TOKEN"'"'  $CLOUDS_YAML
 done

ubuntu/ubuntu-24.04.pkr.hcl

@@ -32,7 +32,7 @@ source "qemu" "ubuntu_24_04" {
     "boot",
     "<enter>"
   ]
-  boot_wait                 = "5s"
+  boot_wait                 = "6s"
   disk_size                 = 8000
   format                    = "qcow2"
   headless                  = true