From 91939ce2b9b26ced5eaa90b26545bb2762c699fe Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Fri, 31 Mar 2023 11:17:33 +0200
Subject: [PATCH] [UBOOT] Fix on uboot artifacts deploy
* Fix name of uboot artifacts for all NXP boards
* Create array of uboot files for c31 boards
* The deploy search for all uboot artifacts in the build path
* Create rule to not deploy artifacts to public container if a tag
occurs
---
boards/.c12.yml | 2 +-
boards/.c20.yml | 2 +-
boards/.c26.yml | 2 +-
boards/.c31.yml | 2 +-
boards/.c43.yml | 2 +-
boards/.tanaro.yml | 2 +-
manifest-pipeline-yocto.yml | 20 +++++++++++++-------
scripts/deploy_artifacts.sh | 11 +++++++----
8 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/boards/.c12.yml b/boards/.c12.yml
index 548c9db..ee5d1be 100644
--- a/boards/.c12.yml
+++ b/boards/.c12.yml
@@ -20,7 +20,7 @@ deploy-edgehog-c12:
artifacts: true
variables: &deploy-edgehog-c12
<<: *build-edgehog-c12
- UBOOT_FILE: u-boot.bin
+ UBOOT_FILE: imx-boot
KERNEL_FILE: Image
AZURE_PATH: imx8/c12
diff --git a/boards/.c20.yml b/boards/.c20.yml
index 22f1a4f..36904bb 100644
--- a/boards/.c20.yml
+++ b/boards/.c20.yml
@@ -20,7 +20,7 @@ deploy-edgehog-c20:
artifacts: true
variables: &deploy-edgehog-c20
<<: *build-edgehog-c20
- UBOOT_FILE: u-boot.bin
+ UBOOT_FILE: imx-boot
KERNEL_FILE: Image
AZURE_PATH: imx8/c20
diff --git a/boards/.c26.yml b/boards/.c26.yml
index 2914717..8f3b4cd 100644
--- a/boards/.c26.yml
+++ b/boards/.c26.yml
@@ -20,7 +20,7 @@ deploy-edgehog-c26:
artifacts: true
variables: &deploy-edgehog-c26
<<: *build-edgehog-c26
- UBOOT_FILE: u-boot.bin
+ UBOOT_FILE: imx-boot
KERNEL_FILE: Image
AZURE_PATH: imx8/c26
diff --git a/boards/.c31.yml b/boards/.c31.yml
index d01d0db..7186f79 100644
--- a/boards/.c31.yml
+++ b/boards/.c31.yml
@@ -21,7 +21,7 @@ deploy-edgehog-c31:
artifacts: true
variables: &deploy-edgehog-c31
<<: *build-edgehog-c31
- UBOOT_FILE: uboot.img
+ UBOOT_FILE: uboot.img trust.img idblock.img
KERNEL_FILE: Image
AZURE_PATH: rockchip/c31
diff --git a/boards/.c43.yml b/boards/.c43.yml
index 4f70430..a99e462 100644
--- a/boards/.c43.yml
+++ b/boards/.c43.yml
@@ -20,7 +20,7 @@ deploy-edgehog-c43:
artifacts: true
variables: &deploy-edgehog-c43
<<: *build-edgehog-c43
- UBOOT_FILE: u-boot.bin
+ UBOOT_FILE: imx-boot
KERNEL_FILE: Image
AZURE_PATH: imx8/c43
diff --git a/boards/.tanaro.yml b/boards/.tanaro.yml
index 4e890c1..4cfb54e 100644
--- a/boards/.tanaro.yml
+++ b/boards/.tanaro.yml
@@ -20,7 +20,7 @@ deploy-edgehog-tanaro:
artifacts: true
variables: &deploy-edgehog-tanaro
<<: *build-edgehog-tanaro
- UBOOT_FILE: u-boot.bin
+ UBOOT_FILE: imx-boot
KERNEL_FILE: Image
AZURE_PATH: imx8/tanaro
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 217854b..cd83af4 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -264,9 +264,11 @@ retrigger:
if [ -n "$CI_COMMIT_TAG" ]; then
TAG_NAME=${CI_COMMIT_TAG}
DEPLOY_PATH=${TAG_NAME}
- AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
- AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
AZURE_PATH="${AZURE_PATH}/edgehog"
+ if [ ! -n "$CUSTOM" ]; then
+ AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
+ AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+ fi
fi
- sh scripts/artifacts_name.sh $TAG_NAME \
$DEPLOY_DATE
@@ -296,9 +298,11 @@ retrigger:
if [ -n "$CI_COMMIT_TAG" ]; then
TAG_NAME=${CI_COMMIT_TAG}
DEPLOY_PATH=${TAG_NAME}
- AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
- AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
AZURE_PATH="${AZURE_PATH}/edgehog"
+ if [ ! -n "$CUSTOM" ]; then
+ AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
+ AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+ fi
fi
echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
@@ -330,7 +334,7 @@ changelog:
- send_notify
allow_failure: true
rules:
- - *build_rule
+ - *schedule_tag_rule
script: .gitlab-ci/scripts/changelog_generator.py
--token=${GITBOT_TOKEN}
--branch=${MASTER_BRANCH}
@@ -365,8 +369,10 @@ notify:
if [ -n "$CI_COMMIT_TAG" ]; then
TAG_NAME=${CI_COMMIT_TAG}
- AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
- AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+ if [ ! -n "$CUSTOM" ]; then
+ AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
+ AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+ fi
else
TAG_NAME=$(date +%Y%m%d)
fi
diff --git a/scripts/deploy_artifacts.sh b/scripts/deploy_artifacts.sh
index 93c2d33..fc03aef 100644
--- a/scripts/deploy_artifacts.sh
+++ b/scripts/deploy_artifacts.sh
@@ -43,10 +43,13 @@ case none in
#Compress the uboot package and create a tar.gz file
echo $ART_PATH
ls -la $ART_PATH
- find $ART_PATH -iname $UBOOT_FILE -exec cp -L {} $BASE_DIRECTORY/ \;
- echo "${UBOOT_FILE}"
- ls -la
- tar -czvf $BASE_DIRECTORY/$uboot_filename -C $BASE_DIRECTORY $UBOOT_FILE
+ uboot_dir="$BASE_DIRECTORY/seco-uboot"
+ mkdir -p $uboot_dir
+
+ for el in $UBOOT_FILE; do
+ find $ART_PATH -iname $el -exec cp -L {} $uboot_dir/ \;
+ done
+ tar -czvf $BASE_DIRECTORY/$uboot_filename -C $uboot_dir $(for el in ${UBOOT_FILE}; do echo $el; done)
ls -la
az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
--
GitLab