From 5b87d9701f4bc7b72d26d92d7f552c2adf7d10d6 Mon Sep 17 00:00:00 2001
From: Luca Romoli <luca.romoli@seco.com>
Date: Wed, 9 Oct 2024 09:24:06 +0000
Subject: [PATCH] [FIX][TEST][RELEASE] fix in image update job and in custom
release - The bmap files are not accessible from the custom project release
pages, this is due to the fact that the access token appended to the links
grants access to the "image" files. This commit fix that; - Delete the
appended token in custom images links because another token is already added
in the deploy stage, when the deploy_artifacts.sh script is called.
---
build-pipeline.yml | 5 -----
scripts/generate_report.sh | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/build-pipeline.yml b/build-pipeline.yml
index 81bbd33..0c8221e 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -338,11 +338,6 @@ workflow:
- cat ${link_report}
- image_url=$(cat ${link_report} | grep 'seco.*'"${BOARD}"'.*image.*.wic.bz2')
- echo ${image_url}
- - |
- if [ -n "$CUSTOM" ]; then
- image_url="${image_url}?${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
- echo "{image_url}"
- fi
- |
echo "Submitting LAVA job .."
python3 lava-test/scripts/submit_test.py \
diff --git a/scripts/generate_report.sh b/scripts/generate_report.sh
index 77554e9..8deb874 100644
--- a/scripts/generate_report.sh
+++ b/scripts/generate_report.sh
@@ -67,7 +67,7 @@ if [ "$CI_JOB_STATUS" == "success" ]; then
url_filesystem=$(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name --output tsv | sed -E 's/\?s.*//')
sas_image=$(az storage blob generate-sas --account-key $AZURE_STORAGE_KEY --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$image_name --permissions r --expiry "$expire_date" --output tsv)
url_image=$(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$image_name --output tsv | sed -E 's/\?s.*//')
- sas_bmap=$(az storage blob generate-sas --account-key $AZURE_STORAGE_KEY --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$image_name --permissions r --expiry "$expire_date" --output tsv)
+ sas_bmap=$(az storage blob generate-sas --account-key $AZURE_STORAGE_KEY --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name --permissions r --expiry "$expire_date" --output tsv)
url_bmap=$(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name --output tsv | sed -E 's/\?s.*//')
artifacts="bundle uboot kernel filesystem image bmap"
--
GitLab