diff --git a/boards/.a62.yml b/boards/.a62.yml
index 955b80d743b946dd4a62b33214b591f02ce2db2f..dc93cd65001614ed2e1065e1bb70b6c557294f07 100644
--- a/boards/.a62.yml
+++ b/boards/.a62.yml
@@ -1,3 +1,7 @@
+########################
+#### EDGEHOG THINGS ####
+########################
+
build-edgehog-a62:
extends: .build
variables: &build-edgehog-a62
@@ -6,6 +10,7 @@ build-edgehog-a62:
BUILD_DIRECTORY: build_a62
MACHINE: seco-imx6qdl-a62
DEFCONFIG_FILE: seco_sbc_a62_edgehog
+ RECIPE_NAME: seco-image-edgehog
deploy-edgehog-a62:
extends: .deploy
@@ -16,4 +21,51 @@ deploy-edgehog-a62:
<<: *build-edgehog-a62
UBOOT_FILE: u-boot.imx
KERNEL_FILE: zImage
- AZURE_PATH: imx6/a62
\ No newline at end of file
+ AZURE_PATH: imx6/a62
+ IMAGE_NAME: edgehog-base-image
+
+#############################
+### EDGEHOG EMBEDDED BASE ###
+#############################
+
+build-edgehog-embedded-base-a62:
+ extends: .build
+ variables: &build-edgehog-embedded-a62
+ <<: *build-edgehog-a62
+ RECIPE_NAME: seco-image-edgehog-base
+ BUILD_DIRECTORY: build_a62_embedded_wayland
+ DEFCONFIG_FILE: seco_sbc_a62_edgehog_embedded_wayland
+
+deploy-edgehog-embedded-base-a62:
+ extends: .deploy
+ needs:
+ - job: build-edgehog-embedded-base-a62
+ artifacts: true
+ variables:
+ <<: *deploy-edgehog-a62
+ IMAGE_NAME: edgehog-embedded-base-image
+
+#############################
+### EDGEHOG EMBEDDED FULL ###
+#############################
+
+build-edgehog-embedded-full-a62:
+ extends: .build
+ rules: &embedded_full
+ # Build only in case of a tag
+ - if: $CI_COMMIT_TAG
+ variables:
+ <<: *build-edgehog-embedded-a62
+ RECIPE_NAME: seco-image-edgehog-full
+
+deploy-edgehog-embedded-full-a62:
+ extends: .deploy
+ rules:
+ # Build only in case of a tag
+ - *embedded_full
+ needs:
+ - job: build-edgehog-embedded-full-a62
+ artifacts: true
+ variables:
+ <<: *deploy-edgehog-a62
+ IMAGE_NAME: edgehog-embedded-full-image
\ No newline at end of file
diff --git a/boards/.c20.yml b/boards/.c20.yml
index 93016fca8e315bf86efaaf39c97c36d9e3aa2e9c..4e1c5c4f7b23bb71dc8d8e81b8927300e6ca80c1 100644
--- a/boards/.c20.yml
+++ b/boards/.c20.yml
@@ -1,3 +1,7 @@
+########################
+#### EDGEHOG THINGS ####
+########################
+
build-edgehog-c20:
extends: .build
variables: &build-edgehog-c20
@@ -16,4 +20,51 @@ deploy-edgehog-c20:
<<: *build-edgehog-c20
UBOOT_FILE: u-boot.bin
KERNEL_FILE: Image
- AZURE_PATH: imx8/c20
\ No newline at end of file
+ AZURE_PATH: imx8/c20
+ IMAGE_NAME: edgehog-base-image
+
+#############################
+### EDGEHOG EMBEDDED BASE ###
+#############################
+
+build-edgehog-embedded-base-c20:
+ extends: .build
+ variables: &build-edgehog-embedded-c20
+ <<: *build-edgehog-c20
+ RECIPE_NAME: seco-image-edgehog-base
+ BUILD_DIRECTORY: build_c20_embedded_wayland
+ DEFCONFIG_FILE: seco_sbc_c20_edgehog_embedded_wayland
+
+deploy-edgehog-embedded-base-c20:
+ extends: .deploy
+ needs:
+ - job: build-edgehog-embedded-base-c20
+ artifacts: true
+ variables:
+ <<: *deploy-edgehog-c20
+ IMAGE_NAME: edgehog-embedded-base-image
+
+#############################
+### EDGEHOG EMBEDDED FULL ###
+#############################
+
+build-edgehog-embedded-full-c20:
+ extends: .build
+ rules: &embedded_full
+ # Build only in case of a tag
+ - if: $CI_COMMIT_TAG
+ variables:
+ <<: *build-edgehog-embedded-c20
+ RECIPE_NAME: seco-image-edgehog-full
+
+deploy-edgehog-embedded-full-c20:
+ extends: .deploy
+ rules:
+ # Build only in case of a tag
+ - *embedded_full
+ needs:
+ - job: build-edgehog-embedded-full-c20
+ artifacts: true
+ variables:
+ <<: *deploy-edgehog-c20
+ IMAGE_NAME: edgehog-embedded-full-image
\ No newline at end of file
diff --git a/boards/.c26.yml b/boards/.c26.yml
deleted file mode 100644
index c8da730bc4b6a4ddd3fc3c78e33100a25771cb3e..0000000000000000000000000000000000000000
--- a/boards/.c26.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-build-edgehog-c26:
- extends: .build
- variables: &build-edgehog-c26
- MACHINE: seco-imx8qm-c26
- DEFCONFIG_FILE: TODO
- BOARD: c26
\ No newline at end of file
diff --git a/boards/.c31.yml b/boards/.c31.yml
index 6e21377d57c35e509f5c9681a0a6518a83987ab9..494d83815b6ef21edb53b580737d0e9928d78c93 100644
--- a/boards/.c31.yml
+++ b/boards/.c31.yml
@@ -1,3 +1,7 @@
+########################
+#### EDGEHOG THINGS ####
+########################
+
build-edgehog-c31:
extends: .build
variables: &build-edgehog-c31
@@ -16,4 +20,52 @@ deploy-edgehog-c31:
<<: *build-edgehog-c31
UBOOT_FILE: uboot.img
KERNEL_FILE: Image
- AZURE_PATH: rockchip/c31
\ No newline at end of file
+ AZURE_PATH: rockchip/c31
+ IMAGE_NAME: edgehog-base-image
+
+#############################
+### EDGEHOG EMBEDDED BASE ###
+#############################
+
+build-edgehog-embedded-base-c31:
+ extends: .build
+ variables: &build-edgehog-embedded-c31
+ <<: *build-edgehog-c31
+ RECIPE_NAME: seco-image-edgehog-base
+ BUILD_DIRECTORY: build_c31_embedded_wayland
+ DEFCONFIG_FILE: seco_sbc_c31_edgehog_embedded_wayland
+
+deploy-edgehog-embedded-base-c31:
+ extends: .deploy
+ needs:
+ - job: build-edgehog-embedded-base-c31
+ artifacts: true
+ variables:
+ <<: *deploy-edgehog-c31
+ IMAGE_NAME: edgehog-embedded-base-image
+
+#############################
+### EDGEHOG EMBEDDED FULL ###
+#############################
+
+build-edgehog-embedded-full-c31:
+ extends: .build
+ rules: &embedded_full
+ # Build only in case of a tag
+ - if: $CI_COMMIT_TAG
+ variables:
+ <<: *build-edgehog-embedded-c31
+ RECIPE_NAME: seco-image-edgehog-full
+
+
+deploy-edgehog-embedded-full-c31:
+ extends: .deploy
+ rules:
+ # Build only in case of a tag
+ - *embedded_full
+ needs:
+ - job: build-edgehog-embedded-full-c31
+ artifacts: true
+ variables:
+ <<: *deploy-edgehog-c31
+ IMAGE_NAME: edgehog-embedded-full-image
\ No newline at end of file
diff --git a/boards/.c43.yml b/boards/.c43.yml
deleted file mode 100644
index 9ea5615b609b57b2543675bcaf6ad42076a0a73b..0000000000000000000000000000000000000000
--- a/boards/.c43.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-build-edgehog-c43:
- extends: .build
- variables: &build-edgehog-c43
- MACHINE: seco-imx8qm-c43
- DEFCONFIG_FILE: seco_sbc_c43_edgehog
- BOARD: c43
\ No newline at end of file
diff --git a/boards/.tanaro.yml b/boards/.tanaro.yml
index e2657bc4ddb86b919719fe34067c0484f463b11d..61667dd7f2ece046eeddc46dd4213e6835bc5a75 100644
--- a/boards/.tanaro.yml
+++ b/boards/.tanaro.yml
@@ -1,3 +1,7 @@
+########################
+#### EDGEHOG THINGS ####
+########################
+
build-edgehog-tanaro:
extends: .build
variables: &build-edgehog-tanaro
@@ -17,3 +21,50 @@ deploy-edgehog-tanaro:
UBOOT_FILE: u-boot.bin
KERNEL_FILE: Image
AZURE_PATH: imx8/tanaro
+ IMAGE_NAME: edgehog-base-image
+
+#############################
+### EDGEHOG EMBEDDED BASE ###
+#############################
+
+build-edgehog-embedded-base-tanaro:
+ extends: .build
+ variables: &build-edgehog-embedded-tanaro
+ <<: *build-edgehog-tanaro
+ RECIPE_NAME: seco-image-edgehog-base
+ BUILD_DIRECTORY: build_tanaro_embedded_wayland
+ DEFCONFIG_FILE: seco_sbc_tanaro_edgehog_embedded_wayland
+
+deploy-edgehog-embedded-base-tanaro:
+ extends: .deploy
+ needs:
+ - job: build-edgehog-embedded-base-tanaro
+ artifacts: true
+ variables:
+ <<: *deploy-edgehog-tanaro
+ IMAGE_NAME: edgehog-embedded-base-image
+
+#############################
+### EDGEHOG EMBEDDED FULL ###
+#############################
+
+build-edgehog-embedded-full-tanaro:
+ extends: .build
+ rules: &embedded_full
+ # Build only in case of a tag
+ - if: $CI_COMMIT_TAG
+ variables:
+ <<: *build-edgehog-embedded-tanaro
+ RECIPE_NAME: seco-image-edgehog-full
+
+deploy-edgehog-embedded-full-tanaro:
+ extends: .deploy
+ rules:
+ # Build only in case of a tag
+ - *embedded_full
+ needs:
+ - job: build-edgehog-embedded-full-tanaro
+ artifacts: true
+ variables:
+ <<: *deploy-edgehog-tanaro
+ IMAGE_NAME: edgehog-embedded-full-image
\ No newline at end of file
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 6d43417cbfda9e1e2bfd88dcad03f10a5ea6dedd..c0c844cd76c71c65bfbd468061da2be2afcd2c7c 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -25,7 +25,6 @@ variables:
# GitLab group to search for projects to retrigger
RETRIGGER_GROUP: ${CI_PROJECT_ROOT_NAMESPACE}
BUILD_TIMEOUT: 6h
- RECIPE_NAME: seco-image-edgehog
IMAGES_PATH: "tmp/deploy/images"
TAG_NAME: weekly
KERNEL: 5-10-52
@@ -203,7 +202,7 @@ retrigger:
. ./seco-setup.sh -d ${DEFCONFIG_FILE};
. ./seco-setup.sh -c;
time bitbake ${RECIPE_NAME};
- time bitbake seco-bundle-edgehog;
+ if [[ "$CI_JOB_NAME" != *"embedded"* ]]; then time bitbake seco-bundle-edgehog; fi;
"
- ls -la
- pwd
@@ -235,6 +234,7 @@ retrigger:
- Job_report_$BOARD.txt
- Job_message_$BOARD.txt
allow_failure: true
+
#############################
########## DEPLOY ###########
#############################
@@ -264,122 +264,146 @@ retrigger:
TAG_NAME=${CI_COMMIT_TAG}
AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
- AZURE_PATH="${AZURE_PATH}/edgehog"
fi
- |
- uboot_filename="seco_edgehog_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
- uboot_filename_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
- kernel_filename="seco_edgehog_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
- kernel_filename_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
- filesystem_name="seco_edgehog_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
- filesystem_name_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
- image_name="seco_edgehog_"$PROCESSOR"_"$BOARD"_image_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
- image_name_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_image_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
- bmap_name="seco_edgehog_"$PROCESSOR"_"$BOARD"_bmapfile_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
- bmap_name_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_bmapfile_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
- bundle_filename="seco_edgehog_"$PROCESSOR"_"$BOARD"_bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
- bundle_filename_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
-
- case none in
- *${UBOOT_FILE}*) echo "Not deploying U-Boot for this board since not present";;
- * )
- echo "##################################################################"
- echo "######################## UBOOT #################################"
- echo "##################################################################"
-
- #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
- ls -la
-
- az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
- --sas-token $AZURE_STORAGE_SAS_TOKEN \
- --container-name $AZURE_CONTAINER_NAME \
- --file $BASE_DIRECTORY/$uboot_filename \
- --name $AZURE_PATH/$TAG_NAME/$uboot_filename \
- --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/$uboot_filename \
- --name $AZURE_PATH/$TAG_NAME/$uboot_filename_latest \
- --overwrite
- fi
- echo "Finishing U-Boot upload";;
- esac
+ uboot_filename="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
+ uboot_filename_latest="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
+ kernel_filename="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
+ kernel_filename_latest="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
+ filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
+ filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
+ image_name="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
+ image_name_latest="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
+ bmap_name="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
+ bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"${IMAGE_NAME}"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
+ bundle_filename="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
+ bundle_filename_latest="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
- case none in
- *${KERNEL_FILE}*) echo "Not deploying Kernel for this board since not present";;
- * )
- echo "##################################################################"
- echo "######################## KERNEL ################################"
- echo "##################################################################"
-
- kernel_dir="$BASE_DIRECTORY/seco-kernel-$BOARD-$PROCESSOR"
- mkdir -p $kernel_dir/boot $kernel_dir/lib
-
- #Find all the needed kernel packages and copy them inside the proper folders
- find $BASE_DIRECTORY/$ART_PATH -iname $KERNEL_FILE \
- -exec cp -L {} $kernel_dir/boot \;
- find $BASE_DIRECTORY/$ART_PATH -maxdepth 2 -iname *.dtb \
- -exec cp -L {} $kernel_dir/boot \;
- find $BASE_DIRECTORY/$ART_PATH -iname *.dtbo \
- -exec cp -L {} $kernel_dir/boot \;
- find $BASE_DIRECTORY/$ART_PATH -iname *fw*.bin \
- -exec cp -L {} $kernel_dir/boot \;
- find $BASE_DIRECTORY/$ART_PATH -iname modules-seco-*.tgz \
- -exec cp -L {} $BASE_DIRECTORY/temp_mod.tgz \;
- tar -xf $BASE_DIRECTORY/temp_mod.tgz -C $kernel_dir
- rm $BASE_DIRECTORY/temp_mod.tgz
-
- #Compress the kernel package and create a tar.gz file
- tar -czvf $BASE_DIRECTORY/$kernel_filename -C $kernel_dir boot lib
- rm -rf $kernel_dir
- az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
- --sas-token $AZURE_STORAGE_SAS_TOKEN \
- --container-name $AZURE_CONTAINER_NAME \
- --file $BASE_DIRECTORY/$kernel_filename \
- --name $AZURE_PATH/$TAG_NAME/$kernel_filename \
- --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/$kernel_filename \
- --name $AZURE_PATH/$TAG_NAME/$kernel_filename_latest \
- --overwrite
- fi
- 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/$TAG_NAME/$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/$TAG_NAME/$filesystem_name_latest \
- # --overwrite
- # fi
+ if [[ "${$CI_JOB_NAME}" != *"embedded"* ]]; then
+ case none in
+ *${UBOOT_FILE}*) echo "Not deploying U-Boot for this board since not present";;
+ * )
+ echo "##################################################################"
+ echo "######################## UBOOT #################################"
+ echo "##################################################################"
+
+ #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
+ ls -la
+
+ az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
+ --sas-token $AZURE_STORAGE_SAS_TOKEN \
+ --container-name $AZURE_CONTAINER_NAME \
+ --file $BASE_DIRECTORY/$uboot_filename \
+ --name $AZURE_PATH/$TAG_NAME/$uboot_filename \
+ --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/$uboot_filename \
+ --name $AZURE_PATH/$TAG_NAME/$uboot_filename_latest \
+ --overwrite
+ fi
+ echo "Finishing U-Boot upload";;
+ esac
+
+ case none in
+ *${KERNEL_FILE}*) echo "Not deploying Kernel for this board since not present";;
+ * )
+ echo "##################################################################"
+ echo "######################## KERNEL ################################"
+ echo "##################################################################"
+
+ kernel_dir="$BASE_DIRECTORY/seco-kernel-$BOARD-$PROCESSOR"
+ mkdir -p $kernel_dir/boot $kernel_dir/lib
+
+ #Find all the needed kernel packages and copy them inside the proper folders
+ find $BASE_DIRECTORY/$ART_PATH -iname $KERNEL_FILE \
+ -exec cp -L {} $kernel_dir/boot \;
+ find $BASE_DIRECTORY/$ART_PATH -maxdepth 2 -iname *.dtb \
+ -exec cp -L {} $kernel_dir/boot \;
+ find $BASE_DIRECTORY/$ART_PATH -iname *.dtbo \
+ -exec cp -L {} $kernel_dir/boot \;
+ find $BASE_DIRECTORY/$ART_PATH -iname *fw*.bin \
+ -exec cp -L {} $kernel_dir/boot \;
+ find $BASE_DIRECTORY/$ART_PATH -iname modules-seco-*.tgz \
+ -exec cp -L {} $BASE_DIRECTORY/temp_mod.tgz \;
+ tar -xf $BASE_DIRECTORY/temp_mod.tgz -C $kernel_dir
+ rm $BASE_DIRECTORY/temp_mod.tgz
+
+ #Compress the kernel package and create a tar.gz file
+ tar -czvf $BASE_DIRECTORY/$kernel_filename -C $kernel_dir boot lib
+ rm -rf $kernel_dir
+ az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
+ --sas-token $AZURE_STORAGE_SAS_TOKEN \
+ --container-name $AZURE_CONTAINER_NAME \
+ --file $BASE_DIRECTORY/$kernel_filename \
+ --name $AZURE_PATH/$TAG_NAME/$kernel_filename \
+ --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/$kernel_filename \
+ --name $AZURE_PATH/$TAG_NAME/$kernel_filename_latest \
+ --overwrite
+ fi
+ 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/$TAG_NAME/$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/$TAG_NAME/$filesystem_name_latest \
+ # --overwrite
+ # fi
+
+ echo "##################################################################"
+ echo "####################### BUNDLE FILE ############################"
+ echo "##################################################################"
+
+ #Copy the bundle file and rename it
+ find $ART_PATH -iname *"$MACHINE.raucb" -exec cp -L {} $BASE_DIRECTORY/ \;
+ mv *raucb $BASE_DIRECTORY/$bundle_filename
+ az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
+ --sas-token $AZURE_STORAGE_SAS_TOKEN \
+ --container-name $AZURE_CONTAINER_NAME \
+ --file $BASE_DIRECTORY/$bundle_filename \
+ --name $AZURE_PATH/$TAG_NAME/$bundle_filename \
+ --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/$bundle_filename \
+ --name $AZURE_PATH/$TAG_NAME/$bundle_filename_latest \
+ --overwrite
+ fi
+ fi
echo "################################################################"
echo "####################### BMAP IMAGE ###########################"
@@ -427,29 +451,6 @@ retrigger:
--file $BASE_DIRECTORY/$bmap_name \
--name $AZURE_PATH/$TAG_NAME/$bmap_name_latest \
--overwrite
- fi
-
- echo "##################################################################"
- echo "####################### BUNDLE FILE ############################"
- echo "##################################################################"
-
- #Copy the bundle file and rename it
- find $ART_PATH -iname *"$MACHINE.raucb" -exec cp -L {} $BASE_DIRECTORY/ \;
- mv *raucb $BASE_DIRECTORY/$bundle_filename
- az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
- --sas-token $AZURE_STORAGE_SAS_TOKEN \
- --container-name $AZURE_CONTAINER_NAME \
- --file $BASE_DIRECTORY/$bundle_filename \
- --name $AZURE_PATH/$TAG_NAME/$bundle_filename \
- --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/$bundle_filename \
- --name $AZURE_PATH/$TAG_NAME/$bundle_filename_latest \
- --overwrite
fi
after_script:
@@ -462,23 +463,29 @@ retrigger:
echo -e "$CI_JOB_NAME \t $CI_JOB_STATUS" >> Job_report_$BOARD.txt
fi
+ 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}"
+ fi
+
echo "##################################################################" >> Link_report_$BOARD.txt
echo "$BOARD URLs" >> Link_report_$BOARD.txt
echo "##################################################################" >> Link_report_$BOARD.txt
DEPLOY_DATE=$(date +%Y%m%d)
- uboot_filename="seco_edgehog_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
- uboot_filename_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
- kernel_filename="seco_edgehog_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
- kernel_filename_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
- filesystem_name="seco_edgehog_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
- filesystem_name_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
- image_name="seco_edgehog_"$PROCESSOR"_"$BOARD"_image_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
- image_name_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_image_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
- bmap_name="seco_edgehog_"$PROCESSOR"_"$BOARD"_bmapfile_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
- bmap_name_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_bmapfile_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
- bundle_filename="seco_edgehog_"$PROCESSOR"_"$BOARD"_bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
- bundle_filename_latest="seco_edgehog_"$PROCESSOR"_"$BOARD"_bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
+ uboot_filename="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
+ uboot_filename_latest="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
+ kernel_filename="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
+ kernel_filename_latest="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
+ filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
+ filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
+ image_name="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
+ image_name_latest="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
+ bmap_name="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
+ bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"${IMAGE_NAME}"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
+ bundle_filename="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
+ bundle_filename_latest="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
if [ "$CI_JOB_STATUS" == "success" ]; then
echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$uboot_filename) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
@@ -557,6 +564,7 @@ notify:
cat Job_message.txt Job_message_*.txt > Job_message_edgehog_${tag}.txt
cat Job_report_*.txt > Job_report_edgehog_${tag}.txt
cat Link_report_*.txt > Link_report_edgehog_${tag}.txt
+ cp Link_report_edgehog_${tag}.txt Link_report.txt
cat changelog.md > Changelog_edgehog_${tag}.md
sed -i -E 's/\"//g' Link_report_edgehog_${tag}.txt
@@ -601,11 +609,12 @@ notify:
curl -X POST -H "Content-Type: application/json" --data @notification_4.json $WEBHOOK
- echo "${changelog_report#?}" | sed 's/\\.*//' > changelog_link.txt
+ echo "${changelog_report#?}" | cut -f1 -d"?" > changelog_link.txt
artifacts:
expire_in: 4 weeks
paths:
+ - Link_report.txt
- changelog_link.txt
#############################