Merge pull request #369 from hmlanigan/matrix-strategy-includes-addy

WIP: Replace strategy.matrix.include use.
juju · Jan 9, 2024 · 7b49117 · 7b49117
2 parents c6301d1 + 9688f0a
commit 7b49117
Showing 1 changed file with 10 additions and 24 deletions.
diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml
@@ -35,33 +35,19 @@ jobs:
       - run: go build -v .
 
   # Run acceptance tests in a matrix with Terraform CLI versions
-  # Using juju 2.9/stable which requires a classic version
-  # of the microk8s snap. This happens to be the default snap
-  # today.
   test:
     name: Integration
     needs: build
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        terraform:
-          - "1.4.*"
-          - "1.5.*"
-          - "1.6.*"
-        include:
-          - cloud: "lxd"
-            cloud-channel: "5.19/stable"
-            juju-channel: "2.9/stable"
-          - cloud: "microk8s"
-            cloud-channel: "1.28/stable"
-            juju-channel: "2.9/stable"
-          - cloud: "lxd"
-            cloud-channel: "5.19/stable"
-            juju-channel: "3.1/stable"
-          - cloud: "microk8s"
-            cloud-channel: "1.28-strict/stable"
-            juju-channel: "3.1/stable"
+        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.1" }
+          - { cloud: "microk8s", cloud-channel: "1.28", juju: "2.9" }
+          - { cloud: "microk8s", cloud-channel: "1.28-strict", juju: "3.1" }
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
@@ -76,9 +62,9 @@ jobs:
       - name: Setup operator environment
         uses: charmed-kubernetes/actions-operator@main
         with:
-          provider: ${{ matrix.cloud }}
-          channel: ${{ matrix.cloud-channel }}
-          juju-channel: ${{ matrix.juju-channel }}
+          provider: ${{ matrix.action-operator.cloud }}
+          channel: ${{ matrix.action-operator.cloud-channel }}
+          juju-channel: ${{ matrix.action-operator.juju }}
       - name: "Set environment to configure provider"
         # language=bash
         run: |
@@ -93,6 +79,6 @@ jobs:
       - run: go mod download
       - env:
           TF_ACC: "1"
-          TEST_CLOUD: ${{ matrix.cloud }}
+          TEST_CLOUD: ${{ matrix.action-operator.cloud }}
         run: go test -timeout 40m -v -cover ./internal/provider/
         timeout-minutes: 40