[xenomai-images][PATCH] ci: Update AWS Deployment settings to use Cloudfront URL

[xenomai-images][PATCH] ci: Update AWS Deployment settings to use Cloudfront URL

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Remove the acl settings as the are no longer valid.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 scripts/deploy_to_aws.sh  | 10 ++++------
 scripts/run-lava-tests.sh |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/deploy_to_aws.sh b/scripts/deploy_to_aws.sh
index f5aed6f..c555a2c 100755
--- a/scripts/deploy_to_aws.sh
+++ b/scripts/deploy_to_aws.sh
@@ -25,8 +25,6 @@ if [ -z "${destination}" ] || [ -z "${AWS_ACCESS_KEY_ID}" ]  || [ -z "${AWS_SECR
     exit 0
 fi
 
-aws_args="--acl=public-read"
-
 isar_base_name="${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${target}"
 deploy_dir="${destination}/${CI_PIPELINE_ID}/${BUILD_IDENTIFIER}"
 
@@ -39,17 +37,17 @@ if [ ! -f "${kernel}" ]; then
 fi
 
 #KERNEL
-aws s3 cp "${aws_args}" "${kernel}" "${deploy_dir}/${isar_base_name}-${kernel_suffix}"
+aws s3 cp "${kernel}" "${deploy_dir}/${isar_base_name}-${kernel_suffix}"
 # INITRD
-aws s3 cp "${aws_args}" "${images_dir}/${target}/${isar_base_name}-initrd.img" "${deploy_dir}/${isar_base_name}-initrd.img"
+aws s3 cp "${images_dir}/${target}/${isar_base_name}-initrd.img" "${deploy_dir}/${isar_base_name}-initrd.img"
 # ROOTFS
 if ! ls "${images_dir}/${target}/${isar_base_name}".*.gz ; then
     gzip "${images_dir}/${target}/${isar_base_name}.*"
 fi
 image=$(ls "${images_dir}/${target}/${isar_base_name}".*.gz)
-aws s3 cp "${aws_args}" "${image}" "${deploy_dir}/$(basename "${image}")"
+aws s3 cp "${image}" "${deploy_dir}/$(basename "${image}")"
 # DTB
 dtb=$(ls "${images_dir}/${target}/"*.dtb 2> /dev/null || true )
 if [ -n "${dtb}" ] ; then
-    aws s3 cp "${aws_args}" "${dtb}" "${deploy_dir}/$(basename "${dtb}")"
+    aws s3 cp  "${dtb}" "${deploy_dir}/$(basename "${dtb}")"
 fi
diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
index 30a853f..70deb36 100755
--- a/scripts/run-lava-tests.sh
+++ b/scripts/run-lava-tests.sh
@@ -17,7 +17,7 @@ if [ -z "${TARGET}" ]; then
 fi
 
 # S3 artifacts
-artifact_url="${LAVA_ARTIFACTS_URL:-https://xenomai-images-artifacts.s3.amazonaws.com/artifacts}"
+artifact_url="${LAVA_ARTIFACTS_URL:-https://d1a54g2tyy2hl.cloudfront.net/artifacts}"
 # public master
 lava_master_uri="${LAVA_MASTER_URL:-https://lava.xenomai.org}"
 
-- 
2.35.1

Re: [xenomai-images][PATCH] ci: Update AWS Deployment settings to use Cloudfront URL

[Bezdeka, Florian]

On Fri, 2022-09-16 at 15:21 +0200, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Remove the acl settings as the are no longer valid.

Hm... I have no better idea so far, but that means that we can no
longer re-run old pipelines, right?

Regards,
Florian


<snip>

Re: [xenomai-images][PATCH] ci: Update AWS Deployment settings to use Cloudfront URL

[Gylstorff Quirin]

On 9/16/22 15:25, Bezdeka, Florian (T CED SES-DE) wrote:
> On Fri, 2022-09-16 at 15:21 +0200, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Remove the acl settings as the are no longer valid.
> 
> Hm... I have no better idea so far, but that means that we can no
> longer re-run old pipelines, right?
The short answer is yes.

For the artifact upload I have currently no idea to fix it in a 
compatible way.

The download URL can be fixed by setting the `LAVA_ARTIFACTS_URL` in the 
gitlabci environment.

Quirin

> 
> Regards,
> Florian
> 
> 
> <snip>

Re: [xenomai-images][PATCH] ci: Update AWS Deployment settings to use Cloudfront URL

[Jan Kiszka]

On 16.09.22 15:21, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Remove the acl settings as the are no longer valid.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  scripts/deploy_to_aws.sh  | 10 ++++------
>  scripts/run-lava-tests.sh |  2 +-
>  2 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/scripts/deploy_to_aws.sh b/scripts/deploy_to_aws.sh
> index f5aed6f..c555a2c 100755
> --- a/scripts/deploy_to_aws.sh
> +++ b/scripts/deploy_to_aws.sh
> @@ -25,8 +25,6 @@ if [ -z "${destination}" ] || [ -z "${AWS_ACCESS_KEY_ID}" ]  || [ -z "${AWS_SECR
>      exit 0
>  fi
>  
> -aws_args="--acl=public-read"
> -
>  isar_base_name="${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${target}"
>  deploy_dir="${destination}/${CI_PIPELINE_ID}/${BUILD_IDENTIFIER}"
>  
> @@ -39,17 +37,17 @@ if [ ! -f "${kernel}" ]; then
>  fi
>  
>  #KERNEL
> -aws s3 cp "${aws_args}" "${kernel}" "${deploy_dir}/${isar_base_name}-${kernel_suffix}"
> +aws s3 cp "${kernel}" "${deploy_dir}/${isar_base_name}-${kernel_suffix}"
>  # INITRD
> -aws s3 cp "${aws_args}" "${images_dir}/${target}/${isar_base_name}-initrd.img" "${deploy_dir}/${isar_base_name}-initrd.img"
> +aws s3 cp "${images_dir}/${target}/${isar_base_name}-initrd.img" "${deploy_dir}/${isar_base_name}-initrd.img"
>  # ROOTFS
>  if ! ls "${images_dir}/${target}/${isar_base_name}".*.gz ; then
>      gzip "${images_dir}/${target}/${isar_base_name}.*"
>  fi
>  image=$(ls "${images_dir}/${target}/${isar_base_name}".*.gz)
> -aws s3 cp "${aws_args}" "${image}" "${deploy_dir}/$(basename "${image}")"
> +aws s3 cp "${image}" "${deploy_dir}/$(basename "${image}")"
>  # DTB
>  dtb=$(ls "${images_dir}/${target}/"*.dtb 2> /dev/null || true )
>  if [ -n "${dtb}" ] ; then
> -    aws s3 cp "${aws_args}" "${dtb}" "${deploy_dir}/$(basename "${dtb}")"
> +    aws s3 cp  "${dtb}" "${deploy_dir}/$(basename "${dtb}")"
>  fi
> diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
> index 30a853f..70deb36 100755
> --- a/scripts/run-lava-tests.sh
> +++ b/scripts/run-lava-tests.sh
> @@ -17,7 +17,7 @@ if [ -z "${TARGET}" ]; then
>  fi
>  
>  # S3 artifacts
> -artifact_url="${LAVA_ARTIFACTS_URL:-https://xenomai-images-artifacts.s3.amazonaws.com/artifacts}"
> +artifact_url="${LAVA_ARTIFACTS_URL:-https://d1a54g2tyy2hl.cloudfront.net/artifacts}"
>  # public master
>  lava_master_uri="${LAVA_MASTER_URL:-https://lava.xenomai.org}"
>  

Thanks, applied.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux