Re: [isar-cip-core 2/3] deploy-cip-core.sh: Workaround to search for swupdate initrd image name

From: Jan Kiszka <jan.kiszka@siemens.com>
To: Sai.Sathujoda@toshiba-tsip.com, cip-dev@lists.cip-project.org
Cc: dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp
Subject: Re: [isar-cip-core 2/3] deploy-cip-core.sh: Workaround to search for swupdate initrd image name
Date: Wed, 30 Aug 2023 08:39:46 +0200	[thread overview]
Message-ID: <595c4f2e-840e-4e32-8953-5f0079afe186@siemens.com> (raw)
In-Reply-To: <20230830044115.1112349-3-Sai.Sathujoda@toshiba-tsip.com>

On 30.08.23 06:41, Sai.Sathujoda@toshiba-tsip.com wrote:
> From: Sai <Sai.Sathujoda@toshiba-tsip.com>
> 
> Since the security image is now included with swupdate feature, deployment
> of initrd image will fail in CI due to name mismatch. So this workaround
> will search for initrd image name as defined in read-only-rootfs.bbclass

Let's not do this as workaround: Some images, now the security image as
well, are not delivered in broken-up form but only as complete disk
images. There is no point in deploying anything else than that for them,
not even the kernel.

So, let's pass a switch to deploy-cip-core.sh if extra artifacts should
be uploaded as well and disable that for the security images.

Jan

> 
> Signed-off-by: Sai <Sai.Sathujoda@toshiba-tsip.com>
> ---
>  scripts/deploy-cip-core.sh | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/deploy-cip-core.sh b/scripts/deploy-cip-core.sh
> index eaa8974..868e28e 100755
> --- a/scripts/deploy-cip-core.sh
> +++ b/scripts/deploy-cip-core.sh
> @@ -46,9 +46,16 @@ KERNEL_IMAGE="$BASE_PATH-vmlinu[xz]"
>  if [ -f "build/tmp/deploy/images/$TARGET/zImage" ]; then
>  	KERNEL_IMAGE=build/tmp/deploy/images/$TARGET/zImage
>  fi
> +
> +INITRD_IMAGE="${BASE_PATH}-initrd.img"
> +# swupdate image initrd search workaround
> +if [ -f "build/tmp/deployimages/$TARGET/cip-core-initramfs-cip-core-$RELEASE-$TARGET.initrd.img" ]; then
> +	INITRD_IMAGE=build/tmp/deploy/images/$TARGET/cip-core-initramfs-cip-core-$RELEASE-$TARGET.initrd.img
> +fi
> +
>  # shellcheck disable=SC2086
>  aws s3 cp --no-progress --acl public-read $KERNEL_IMAGE "${S3_TARGET}"
> -aws s3 cp --no-progress --acl public-read "${BASE_PATH}-initrd.img" "${S3_TARGET}"
> +aws s3 cp --no-progress --acl public-read "${INITRD_IMAGE}" "${S3_TARGET}"
>  
>  if [ "$DTB" != "none" ]; then
>  	aws s3 cp --no-progress --acl public-read build/tmp/deploy/images/*/"$DTB" "${S3_TARGET}"

-- 
Siemens AG, Technology
Linux Expert Center