From aa71b1e79bd716ea11837c16c0b004cf288cd663 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Thu, 23 Feb 2023 10:05:15 +0100
Subject: [PATCH] [FILESYSTEM] Fix on filesystem deploy
* For Edgehog embedded images the fs was not deployed and so a fix was
necessary
---
manifest-pipeline-yocto.yml | 44 ++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 6e8e9a2..e6f0011 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -381,28 +381,6 @@ retrigger:
echo "Finishing Kernel upload";;
esac
- echo "##################################################################"
- echo "###################### FILESYSTEM ##############################"
- echo "##################################################################"
- find $BASE_DIRECTORY/$ART_PATH -iname *."$FS_EXTENSION" \
- -exec cp -L {} $BASE_DIRECTORY/filesystemTMP.tar.bz2 \;
- mv filesystemTMP.tar.bz2 $BASE_DIRECTORY/$filesystem_name
- az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
- --sas-token $AZURE_STORAGE_SAS_TOKEN \
- --container-name $AZURE_CONTAINER_NAME \
- --file $BASE_DIRECTORY/$filesystem_name \
- --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name \
- --overwrite
-
- if [ ! -n "$CI_COMMIT_TAG" ]; then
- az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
- --sas-token $AZURE_STORAGE_SAS_TOKEN \
- --container-name $AZURE_CONTAINER_NAME \
- --file $BASE_DIRECTORY/$filesystem_name \
- --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name_latest \
- --overwrite
- fi
-
echo "##################################################################"
echo "####################### BUNDLE FILE ############################"
echo "##################################################################"
@@ -427,6 +405,28 @@ retrigger:
fi
fi
+ echo "##################################################################"
+ echo "###################### FILESYSTEM ##############################"
+ echo "##################################################################"
+ find $BASE_DIRECTORY/$ART_PATH -iname *."$FS_EXTENSION" \
+ -exec cp -L {} $BASE_DIRECTORY/filesystemTMP.tar.bz2 \;
+ mv filesystemTMP.tar.bz2 $BASE_DIRECTORY/$filesystem_name
+ az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
+ --sas-token $AZURE_STORAGE_SAS_TOKEN \
+ --container-name $AZURE_CONTAINER_NAME \
+ --file $BASE_DIRECTORY/$filesystem_name \
+ --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name \
+ --overwrite
+
+ if [ ! -n "$CI_COMMIT_TAG" ]; then
+ az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
+ --sas-token $AZURE_STORAGE_SAS_TOKEN \
+ --container-name $AZURE_CONTAINER_NAME \
+ --file $BASE_DIRECTORY/$filesystem_name \
+ --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name_latest \
+ --overwrite
+ fi
+
echo "################################################################"
echo "####################### BMAP IMAGE ###########################"
echo "################################################################"
--
GitLab