Skip to content

Commit bf0a73b

Browse files
authored
VAULT-35190: increasing timeout for aws-nuke clean up job (#30156)
* increasing timeout * reverting aws-nuke back to rebuy/aws-nuke * reverting aws-nuke version * testing cleanup * testing cleanup
1 parent 9231f5d commit bf0a73b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/test-ci-cleanup.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
needs: setup
2929
runs-on: ubuntu-latest
3030
container:
31-
image: ghcr.io/ekristen/aws-nuke:v3.51.0 # https://github.com/ekristen/aws-nuke/pkgs/container/aws-nuke
31+
image: rebuy/aws-nuke # for ekristen version: https://github.com/ekristen/aws-nuke/pkgs/container/aws-nuke
3232
options:
3333
--user root
3434
-t
3535
env:
3636
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
3737
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
3838
TIME_LIMIT: "72h"
39-
timeout-minutes: 60
39+
timeout-minutes: 120
4040
steps:
4141
- name: Configure AWS credentials
4242
id: aws-configure
@@ -61,7 +61,7 @@ jobs:
6161
# Filter STDERR because it's super noisy about things we don't have access to
6262
# Remove --no-dry-run to do dry run
6363
run: |
64-
aws-nuke run -c aws-nuke.yml -q --no-dry-run --force 2>/tmp/aws-nuke-error.log | grep -v "level=error" || true
64+
aws-nuke -c aws-nuke.yml -q --no-dry-run --force 2>/tmp/aws-nuke-error.log || true
6565
6666
check-quotas:
6767
needs: [ setup, aws-nuke ]

enos/ci/aws-nuke.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ regions:
2121
- us-west-2
2222
- global
2323

24-
blocklist:
24+
account-blocklist:
2525
- 1234567890
2626

2727
accounts:

0 commit comments

Comments
 (0)