From 7760ba542e73caab9de2fc518548aa0bbe810ae9 Mon Sep 17 00:00:00 2001 From: Kishore Vinjam Date: Mon, 2 Oct 2023 22:48:51 -0400 Subject: [PATCH] change publication to aws-abi bucket and some cleanup in publication stage --- .../publication/Dockerfile.rej | 6 ------ .project_automation/publication/entrypoint.sh | 8 ++++---- .../publication/entrypoint.sh.save | 19 ------------------- 3 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 .project_automation/publication/Dockerfile.rej delete mode 100755 .project_automation/publication/entrypoint.sh.save diff --git a/.project_automation/publication/Dockerfile.rej b/.project_automation/publication/Dockerfile.rej deleted file mode 100644 index f68cec8..0000000 --- a/.project_automation/publication/Dockerfile.rej +++ /dev/null @@ -1,6 +0,0 @@ -diff a/.project_automation/publication/Dockerfile b/.project_automation/publication/Dockerfile (rejected hunks) -@@ -2,2 +2,3 @@ FROM public.ecr.aws/codebuild/amazonlinux2-x86_64-standard:4.0 - RUN yum install -y yum-utils && yum-config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo && yum install -y gh --RUN pip install taskcat -+RUN git clone https://github.com/aws-ia/taskcat.git -b fix_s3_upload /tmp/taskcat && cd /tmp/taskcat && pip install . -+#RUN pip install taskcat diff --git a/.project_automation/publication/entrypoint.sh b/.project_automation/publication/entrypoint.sh index 2a0aca9..301e95b 100755 --- a/.project_automation/publication/entrypoint.sh +++ b/.project_automation/publication/entrypoint.sh @@ -14,7 +14,7 @@ REPO_NAME=$(git config --get remote.origin.url | cut -d '/' -f5 | cut -d '.' -f1 VERSION=$(cat VERSION) BASE_URL="this would be the path to s3 bucket/${REPO_NAME}/" -S3_URI="s3://aws-abi-pilot/guide/${REPO_NAME}/" +S3_URI="s3://aws-abi/guide/${REPO_NAME}/" print_header() { printf "\n\n%s\n" "$*" @@ -36,13 +36,13 @@ printf "\nPublished at ${BASE_URL}\n" cd ${PROJECT_PATH} -taskcat upload --bucket-name aws-abi-pilot --object-acl public-read +taskcat upload --bucket-name aws-abi --object-acl public-read # cd ${PROJECT_PATH}/guide # hugo -# aws s3 cp --recursive public s3://aws-abi-pilot/docs-preview/ --acl public-read +# aws s3 cp --recursive public s3://aws-abi/docs-preview/ --acl public-read # -# echo "docs published here: s3://aws-abi-pilot/docs-preview/" +# echo "docs published here: s3://aws-abi/docs-preview/" # # if [ -n "${BASE_PATH}" ] # then diff --git a/.project_automation/publication/entrypoint.sh.save b/.project_automation/publication/entrypoint.sh.save deleted file mode 100755 index 86f744e..0000000 --- a/.project_automation/publication/entrypoint.sh.save +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -ex - -## NOTE: paths may differ when running in a managed task. To ensure behavior is consistent between -# managed and local tasks always use these variables for the project and project type path -PROJECT_PATH=${BASE_PATH}/project -PROJECT_TYPE_PATH=${BASE_PATH}/projecttype - -cd ${PROJECT_PATH} - -taskcat upload --bucket-name aws-abi-pilot --object-acl public-read - -# if [ -n "${BASE_PATH}" ] -# then -# echo "Running Publication" -# taskcat upload -# else -# echo "Local build mode (skipping publication)" -# fi -