Rename S3 buckets for migration
- Use S3 bucket in Arm infrastrcture
- As there are multiple environments such as (DEV, TEST, PROD)
suffix bucket with INRA_ENV name.
Signed-off-by: Saheer Babu <saheer.babu@arm.com>
diff --git a/ci-dockerfiles-deployment/builders.sh b/ci-dockerfiles-deployment/builders.sh
index 6030115..3977465 100644
--- a/ci-dockerfiles-deployment/builders.sh
+++ b/ci-dockerfiles-deployment/builders.sh
@@ -42,7 +42,7 @@
cd dockerfiles/
aws configure list
-aws s3 cp --recursive s3://trustedfirmware-private/armclang/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-private-${INFRA_ENV}/armclang/ .
find .
df -h
diff --git a/fvp-docker-images/builders.sh b/fvp-docker-images/builders.sh
index e629eb8..3cbb4b8 100644
--- a/fvp-docker-images/builders.sh
+++ b/fvp-docker-images/builders.sh
@@ -18,7 +18,7 @@
aws configure list
ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
-aws s3 cp --recursive s3://trustedfirmware-fvp/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-fvp-${INFRA_ENV}/ .
aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
diff --git a/iar-docker-images/builders.sh b/iar-docker-images/builders.sh
index ce2e29a..aa68454 100755
--- a/iar-docker-images/builders.sh
+++ b/iar-docker-images/builders.sh
@@ -19,9 +19,9 @@
ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
export IAR_ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com/iar
# Get armclang toolchain
-aws s3 cp --recursive s3://trustedfirmware-private/armclang/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-private-${INFRA_ENV}/armclang/ .
# Get IAR toolchain binary
-aws s3 cp --recursive s3://trustedfirmware-iar/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-iar-${INFRA_ENV}/ .
find .
aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
diff --git a/misra-docker-images/builders.sh b/misra-docker-images/builders.sh
index 977d4c9..cdd89ce 100755
--- a/misra-docker-images/builders.sh
+++ b/misra-docker-images/builders.sh
@@ -17,7 +17,7 @@
export ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
# we are expecting private files to be kept in the dockerfiles/*
# subdirs with a matching name for the image
-aws s3 cp --recursive s3://trustedfirmware-misra/dockerfiles/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-misra-${INFRA_ENV}/dockerfiles/ .
find .
aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR