diff --git a/circleci/catapult-publish-lambda b/circleci/catapult-publish-lambda index 68c2347..baa9d01 100755 --- a/circleci/catapult-publish-lambda +++ b/circleci/catapult-publish-lambda @@ -55,7 +55,7 @@ if [[ $RUN_TYPE != "lambda" ]]; then exit 1 fi -AWS_REGIONS="us-east-1 us-east-2 us-west-1 us-west-2" +AWS_REGIONS="us-east-1 us-west-1 us-west-2" for REGION in ${AWS_REGIONS}; do S3_ARTIFACTS=${S3_ARTIFACTS},"S3Buckets={${REGION}=\\\"${LAMBDA_AWS_BUCKET}-${REGION}" done diff --git a/circleci/docker-publish b/circleci/docker-publish index b62cc18..8240c3d 100755 --- a/circleci/docker-publish +++ b/circleci/docker-publish @@ -89,7 +89,6 @@ ORG=clever ECR_REGION_US_WEST_1=us-west-1 ECR_REGION_US_WEST_2=us-west-2 ECR_REGION_US_EAST_1=us-east-1 -ECR_REGION_US_EAST_2=us-east-2 AWS_ECR_PROFILE=oidc-ecr-profile echo "Docker version..." @@ -132,18 +131,15 @@ if [[ -z $OIDC_ECR_UPLOAD_ROLE ]]; then ecr_login $ECR_REGION_US_WEST_1 $ECR_PUSH_ID $ECR_PUSH_SECRET ecr_login $ECR_REGION_US_WEST_2 $ECR_PUSH_ID $ECR_PUSH_SECRET ecr_login $ECR_REGION_US_EAST_1 $ECR_PUSH_ID $ECR_PUSH_SECRET - ecr_login $ECR_REGION_US_EAST_2 $ECR_PUSH_ID $ECR_PUSH_SECRET else echo "Logging into ECR using role credentials..." assume_role_with_web_identity $OIDC_ECR_UPLOAD_ROLE $AWS_ECR_PROFILE ecr_login_with_profile $ECR_REGION_US_WEST_1 ecr_login_with_profile $ECR_REGION_US_WEST_2 ecr_login_with_profile $ECR_REGION_US_EAST_1 - ecr_login_with_profile $ECR_REGION_US_EAST_2 fi echo "Pushing to ECR..." push_ecr_image $ECR_REGION_US_WEST_1 push_ecr_image $ECR_REGION_US_WEST_2 -push_ecr_image $ECR_REGION_US_EAST_1 -push_ecr_image $ECR_REGION_US_EAST_2 +push_ecr_image $ECR_REGION_US_EAST_1 \ No newline at end of file