From c4d99a25ee8253bc478e9c0d68ca4e6686fcb6cb Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Thu, 7 Nov 2024 10:50:05 -0800 Subject: [PATCH 1/4] Update terraform_plan.yaml --- .github/workflows/terraform_plan.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/terraform_plan.yaml b/.github/workflows/terraform_plan.yaml index 2167303..47bbb99 100644 --- a/.github/workflows/terraform_plan.yaml +++ b/.github/workflows/terraform_plan.yaml @@ -87,6 +87,7 @@ jobs: - name: s3-cleanup uses: CSVD/s3-cleanup@main + if: ${{ always() }} with: cache_key: ${{ steps.terraform_init.outputs.s3_upload_path }} bucket: image-pipeline-assets From 252205f899506115c80480190bdd333eedbf633a Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Thu, 7 Nov 2024 10:52:06 -0800 Subject: [PATCH 2/4] Update terraform_apply.yaml --- .github/workflows/terraform_apply.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform_apply.yaml b/.github/workflows/terraform_apply.yaml index 12c67b3..44380ba 100644 --- a/.github/workflows/terraform_apply.yaml +++ b/.github/workflows/terraform_apply.yaml @@ -97,7 +97,13 @@ jobs: HTTP_PROXY: http://proxy.tco.census.gov:3128 HTTPS_PROXY: http://proxy.tco.census.gov:3128 NO_PROXY: ".census.gov,169.254.169.254,148.129.*,10.*,172.18.*,172.22.*,172.23.*,172.24.*,172.25.*,.eks.amazonaws.com,.s3.amazonaws.com,.amazonaws.com" - + + - name: s3-cleanup + uses: CSVD/s3-cleanup@main + if: ${{ failure() }} + with: + cache_key: ${{ steps.terraform_init.outputs.s3_upload_path }} + bucket: image-pipeline-assets Apply: # The type of runner that the job will run on runs-on: ["229685449397"] @@ -139,4 +145,9 @@ jobs: HTTPS_PROXY: http://proxy.tco.census.gov:3128 NO_PROXY: ".census.gov,169.254.169.254,148.129.*,10.*,172.18.*,172.22.*,172.23.*,172.24.*,172.25.*,.eks.amazonaws.com,.s3.amazonaws.com,.amazonaws.com" - + - name: s3-cleanup + uses: CSVD/s3-cleanup@main + if: ${{ always() }} + with: + cache_key: ${{ steps.terraform_init.outputs.s3_upload_path }} + bucket: image-pipeline-assets From 12e033720fc7e3f6c624647f2a17abc4218c317e Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Thu, 7 Nov 2024 10:54:14 -0800 Subject: [PATCH 3/4] Update terraform_plan.yaml --- .github/workflows/terraform_plan.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/terraform_plan.yaml b/.github/workflows/terraform_plan.yaml index 47bbb99..201d091 100644 --- a/.github/workflows/terraform_plan.yaml +++ b/.github/workflows/terraform_plan.yaml @@ -9,6 +9,7 @@ on: concurrency: group: ${{ github.repo }}-${{ vars.terraform_workspace }} + cancel-in-progress: false permissions: write-all # A workflow run is made up of one or more jobs that can run sequentially or in parallel From bab6d4f93a17d38576e9ee7b5c5b23cf3d00092f Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Thu, 7 Nov 2024 10:54:31 -0800 Subject: [PATCH 4/4] Update terraform_apply.yaml --- .github/workflows/terraform_apply.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/terraform_apply.yaml b/.github/workflows/terraform_apply.yaml index 44380ba..225a822 100644 --- a/.github/workflows/terraform_apply.yaml +++ b/.github/workflows/terraform_apply.yaml @@ -11,6 +11,7 @@ on: concurrency: group: ${{ github.repo }}-${{ vars.terraform_workspace }} + cancel-in-progress: false permissions: write-all # A workflow run is made up of one or more jobs that can run sequentially or in parallel