From f408154917b9dea9d6ff75b289d7941f1e18ac30 Mon Sep 17 00:00:00 2001
From: test-cli-e2e-aws <test-cli-e2e-aws@srv.plural.sh>
Date: Thu, 5 Dec 2024 14:52:06 +0100
Subject: [PATCH] tune aws-nuke

---
 .github/workflows/e2e.yaml        | 10 +++-------
 test/plural/lib/aws-teardown.yaml |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index d28f1c1c..ea5dd5e1 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -43,10 +43,6 @@ jobs:
           aws-region: eu-west-1
           role-to-assume: arn:aws:iam::911167907168:role/GitHubAction-AssumeRoleWithAction
           role-session-name: GitHub_to_AWS_via_FederatedOIDC
-      - uses: mcblair/configure-aws-profile-action@v1.0.0
-        with:
-          role-arn: arn:aws:iam::911167907168:role/GitHubAction-AssumeRoleWithAction
-          profile-name: aws-nuke
       - name: Store test timestamp
         run: echo "TIMESTAMP=$(date +'%s')" >> $GITHUB_ENV
       - name: Setup test repository SSH key
@@ -79,8 +75,8 @@ jobs:
           plural version
       - name: Print Terraform version
         run: terraform --version
-      - name: Print Google Cloud CLI version
-        run: gcloud --version
+      - name: Print AWS CLI version
+        run: aws --version
       - name: Create kube directory
         run: |
           mkdir -p $HOME/.kube
@@ -248,7 +244,7 @@ jobs:
               - file: ${{ env.TESTOUT_PATH }}/test_results.html
                 filename: rest_results.html
   plural-up-azure:
-    # if: false
+    if: false
     name: plural up / Azure
     runs-on: ubuntu-latest
     steps:
diff --git a/test/plural/lib/aws-teardown.yaml b/test/plural/lib/aws-teardown.yaml
index 00e9b1e3..3db277c5 100644
--- a/test/plural/lib/aws-teardown.yaml
+++ b/test/plural/lib/aws-teardown.yaml
@@ -2,8 +2,8 @@ executor: aws-teardown
 input:
   resourceGroup: ''
 steps:
-  - script: aws-nuke run --config ../../nuke-config.yml --force --profile aws-nuke --no-dry-run --no-alias-check --max-wait-retries 10
-    retry: 3
+  - script: aws-nuke run --config ../../nuke-config.yml --force --access-key-id $AWS_ACCESS_KEY_ID --secret-access-key $AWS_SECRET_ACCESS_KEY --no-dry-run --no-alias-check --max-wait-retries 10
+    retry: 5
     retry_if:
       - result.code ShouldNotEqual 0
-    delay: 20
\ No newline at end of file
+    delay: 5
\ No newline at end of file