diff mbox series

[isar-cip-core,v1] .gitlab-ci.yml: Build for delta update when build_swu_v2 is enabled

Message ID 20240517091834.1398975-1-Adithya.Balakumar@toshiba-tsip.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core,v1] .gitlab-ci.yml: Build for delta update when build_swu_v2 is enabled | expand

Commit Message

Adithya Balakumar May 17, 2024, 9:18 a.m. UTC
Build for delta update when build_swu_v2 is enabled in the CI

Signed-off-by: Adithya Balakumar <Adithya.Balakumar@toshiba-tsip.com>
---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Jan Kiszka May 18, 2024, 4:59 a.m. UTC | #1
On 17.05.24 11:18, Adithya Balakumar wrote:
> Build for delta update when build_swu_v2 is enabled in the CI
> 
> Signed-off-by: Adithya Balakumar <Adithya.Balakumar@toshiba-tsip.com>
> ---
>  .gitlab-ci.yml | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index aab55be..2f88dea 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -70,8 +70,14 @@ default:
>      - kas build ${base_yaml}
>      - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG} wic; fi
>      - if [ "${build_swu_v2}" = "enable" ]; then
> +          mkdir build/previous-image;
> +          if [ "${extension}" = "security" ] || [ "${extension}" = "ebg-secure-boot-snakeoil" ]; then
> +              cp build/tmp/deploy/images/${target}/*.verity build/previous-image;
> +          else
> +              cp build/tmp/deploy/images/${target}/*.squashfs build/previous-image;
> +          fi;
>            echo "PV = \"2.0\"" >> recipes-core/images/cip-core-image-security.bb;
> -          kas build ${base_yaml};
> +          kas build ${base_yaml}:kas/opt/delta-update.yml;
>            scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG} swu;
>        fi
>      - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi

Thanks, applied.

Jan
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aab55be..2f88dea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,8 +70,14 @@  default:
     - kas build ${base_yaml}
     - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG} wic; fi
     - if [ "${build_swu_v2}" = "enable" ]; then
+          mkdir build/previous-image;
+          if [ "${extension}" = "security" ] || [ "${extension}" = "ebg-secure-boot-snakeoil" ]; then
+              cp build/tmp/deploy/images/${target}/*.verity build/previous-image;
+          else
+              cp build/tmp/deploy/images/${target}/*.squashfs build/previous-image;
+          fi;
           echo "PV = \"2.0\"" >> recipes-core/images/cip-core-image-security.bb;
-          kas build ${base_yaml};
+          kas build ${base_yaml}:kas/opt/delta-update.yml;
           scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG} swu;
       fi
     - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi