From 5abdddf9fb6553710711d55e8446d50b5401816a Mon Sep 17 00:00:00 2001 From: Heather Lanigan Date: Wed, 14 Feb 2024 21:47:12 +0000 Subject: [PATCH] Test with the juju 3/stable snap channel. The 3 track for juju snaps is the recommended version of 3 to be using and will continue to update so we don't have to update the minor versions that frequently. Juju 3.4.0 will be released before 3.3.2. Either will have the fix we need to fix the panic for not verifying a map entry before using. --- .github/workflows/canary.yml | 6 +++--- .github/workflows/test_add_machine.yml | 2 +- .github/workflows/test_integration.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 1bdf117e..26dd01ea 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -45,10 +45,10 @@ jobs: juju-channel: "2.9/stable" - cloud: "lxd" cloud-channel: "5.19/stable" - juju-channel: "3.2/stable" + juju-channel: "3/stable" - cloud: "microk8s" cloud-channel: "1.28-strict/stable" - juju-channel: "3.2/stable" + juju-channel: "3/stable" steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 @@ -79,4 +79,4 @@ jobs: - env: TF_ACC: "1" TEST_CLOUD: ${{ matrix.cloud }} - run: go test -timeout 40m -v -cover ./internal/provider/ \ No newline at end of file + run: go test -timeout 40m -v -cover ./internal/provider/ diff --git a/.github/workflows/test_add_machine.yml b/.github/workflows/test_add_machine.yml index 480198e3..41369d69 100644 --- a/.github/workflows/test_add_machine.yml +++ b/.github/workflows/test_add_machine.yml @@ -52,7 +52,7 @@ jobs: - "1.6.*" juju: - "2.9/stable" - - "3.2/stable" + - "3/stable" timeout-minutes: 60 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml index 62fa6252..331b3770 100644 --- a/.github/workflows/test_integration.yml +++ b/.github/workflows/test_integration.yml @@ -48,9 +48,9 @@ jobs: terraform: ["1.4.*", "1.5.*", "1.6.*"] action-operator: - { cloud: "lxd", cloud-channel: "5.19", juju: "2.9" } - - { cloud: "lxd", cloud-channel: "5.19", juju: "3.2" } + - { cloud: "lxd", cloud-channel: "5.19", juju: "3" } - { cloud: "microk8s", cloud-channel: "1.28", juju: "2.9" } - - { cloud: "microk8s", cloud-channel: "1.28-strict", juju: "3.2" } + - { cloud: "microk8s", cloud-channel: "1.28-strict", juju: "3" } timeout-minutes: 60 steps: - uses: actions/checkout@v4