From b8e53419eabe5b1fbf7a4b0561c51f77fa9364ed Mon Sep 17 00:00:00 2001 From: Heather Lanigan Date: Mon, 12 Aug 2024 10:42:09 -0400 Subject: [PATCH 1/2] test: run microk8s against 3 1 rather than 2 9 Charms we need to test with microk8s do not support 2.9, thus test against 3.1 for legacy code paths. Juju 3.1. requires the strictly confined microk8s snap. Update lxd to 5.21 channel while here. --- .github/workflows/test_integration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml index 820ce499..84a7d32e 100644 --- a/.github/workflows/test_integration.yml +++ b/.github/workflows/test_integration.yml @@ -47,10 +47,10 @@ jobs: matrix: terraform: ["1.6.*", "1.7.*", "1.8.*"] action-operator: - - { lxd-channel: "5.19/stable", cloud: "lxd", cloud-channel: "5.19", juju: "2.9" } - - { lxd-channel: "5.19/stable", cloud: "lxd", cloud-channel: "5.19", juju: "3" } - - { lxd-channel: "5.19/stable", cloud: "microk8s", cloud-channel: "1.28", juju: "2.9" } - - { lxd-channel: "5.19/stable", cloud: "microk8s", cloud-channel: "1.28-strict", juju: "3" } + - { lxd-channel: "5.21/stable", cloud: "lxd", cloud-channel: "5.21", juju: "2.9" } + - { lxd-channel: "5.21/stable", cloud: "lxd", cloud-channel: "5.21", juju: "3" } + - { lxd-channel: "5.21/stable", cloud: "microk8s", cloud-channel: "1.28-strict", juju: "3.1" } + - { lxd-channel: "5.21/stable", cloud: "microk8s", cloud-channel: "1.28-strict", juju: "3" } timeout-minutes: 60 steps: - uses: actions/checkout@v4 From 3d1ec27a809fda84ccb1910d2434fce37f7e1eee Mon Sep 17 00:00:00 2001 From: Heather Lanigan Date: Mon, 12 Aug 2024 11:36:06 -0400 Subject: [PATCH 2/2] test: use the latest terraform cli in testing Swap for a newer version of terraform when testing: 1.9 for 1.8. Where we test with multiple versions, only use the latest 3. --- .github/workflows/canary.yml | 2 +- .github/workflows/k8s_tunnel.yml | 2 +- .github/workflows/test_add_machine.yml | 2 +- .github/workflows/test_integration.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 80cf388b..82280bb1 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -35,7 +35,7 @@ jobs: fail-fast: false matrix: terraform: - - "1.8.*" + - "1.9.*" include: - cloud: "lxd" cloud-channel: "5.19/stable" diff --git a/.github/workflows/k8s_tunnel.yml b/.github/workflows/k8s_tunnel.yml index 9e0f9a43..1d15940f 100644 --- a/.github/workflows/k8s_tunnel.yml +++ b/.github/workflows/k8s_tunnel.yml @@ -44,7 +44,7 @@ jobs: cloud: - "microk8s" terraform: - - "1.8.*" + - "1.9.*" timeout-minutes: 60 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test_add_machine.yml b/.github/workflows/test_add_machine.yml index f8aaa5a5..50308c18 100644 --- a/.github/workflows/test_add_machine.yml +++ b/.github/workflows/test_add_machine.yml @@ -49,7 +49,7 @@ jobs: cloud: - "lxd" terraform: - - "1.8.*" + - "1.9.*" juju: - "2.9/stable" - "3/stable" diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml index 84a7d32e..23549da2 100644 --- a/.github/workflows/test_integration.yml +++ b/.github/workflows/test_integration.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - terraform: ["1.6.*", "1.7.*", "1.8.*"] + terraform: ["1.7.*", "1.8.*", "1.9.*"] action-operator: - { lxd-channel: "5.21/stable", cloud: "lxd", cloud-channel: "5.21", juju: "2.9" } - { lxd-channel: "5.21/stable", cloud: "lxd", cloud-channel: "5.21", juju: "3" }