From d7cf2c089bbec37b0f3d4b5a1ac9581703bfecad Mon Sep 17 00:00:00 2001
From: Heather Lanigan <heather.lanigan@canonical.com>
Date: Wed, 18 Oct 2023 11:12:06 -0400
Subject: [PATCH 1/2] Update go test timeout to 40m.

Integration workflow already updated, new tests added for multiple
integrations make the tests take longer.
---
 .github/workflows/canary.yml              | 4 ++--
 .github/workflows/test_new_candidates.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index 6baf4474..dc68bd6e 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -30,7 +30,7 @@ jobs:
     needs:
       - build
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -70,5 +70,5 @@ jobs:
       - env:
           TF_ACC: "1"
           TEST_CLOUD: ${{ matrix.cloud }}
-        run: go test -v -cover ./internal/provider/
+        run: go test -timeout 40m -v -cover ./internal/provider/
       
diff --git a/.github/workflows/test_new_candidates.yml b/.github/workflows/test_new_candidates.yml
index 4fa3ddc6..b169f791 100644
--- a/.github/workflows/test_new_candidates.yml
+++ b/.github/workflows/test_new_candidates.yml
@@ -105,7 +105,7 @@ jobs:
         env:
           TF_ACC: "1"
           TEST_CLOUD: ${{ matrix.cloud }}
-        run: go test -timeout 30m -v -cover ./internal/provider/
+        run: go test -timeout 40m -v -cover ./internal/provider/
         timeout-minutes: 40
       - uses: actions/upload-artifact@v3
         if: ${{ success() }}

From 00ed686d0f420cb621a57d53d262d21575450cee Mon Sep 17 00:00:00 2001
From: Heather Lanigan <heather.lanigan@canonical.com>
Date: Wed, 18 Oct 2023 11:36:56 -0400
Subject: [PATCH 2/2] This action is failing with: "Error: Custom provider set
 without credentials:" but I'm not sure why, the only difference with other
 actions, is this one line.

---
 .github/workflows/test_new_candidates.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test_new_candidates.yml b/.github/workflows/test_new_candidates.yml
index b169f791..4857e3db 100644
--- a/.github/workflows/test_new_candidates.yml
+++ b/.github/workflows/test_new_candidates.yml
@@ -90,6 +90,7 @@ jobs:
           juju-channel: ${{ env.channel }}
       - name: "Set environment to configure provider"
         if: ${{ env.next-test != 'NA' }}
+        # language=bash
         run: |
           CONTROLLER=$(juju whoami --format yaml | yq .controller)