From a4ce7ad0ca01f43f1c5edf63370c56ade5471356 Mon Sep 17 00:00:00 2001
From: James Garner <james.garner@canonical.com>
Date: Thu, 10 Oct 2024 11:57:20 +1300
Subject: [PATCH] ci: apply the same fix to candidate and edge testing actions

---
 .github/workflows/test_candidate.yaml | 13 +++++--------
 .github/workflows/test_edge.yaml      | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test_candidate.yaml b/.github/workflows/test_candidate.yaml
index 5b87cdb4..078bbe7c 100644
--- a/.github/workflows/test_candidate.yaml
+++ b/.github/workflows/test_candidate.yaml
@@ -49,20 +49,17 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
         if: ${{ env.next-test != 'NA' }}
-      - name: Setup operator environment
-        if: ${{ env.next-test != 'NA' }}
-        uses: charmed-kubernetes/actions-operator@main
-        with:
-          provider: lxd
-          juju-channel: 3.4/candidate
       - name: Setup Python
         if: ${{ env.next-test != 'NA' }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - name: Install dependencies
+      - name: Setup operator environment
         if: ${{ env.next-test != 'NA' }}
-        run: pip install tox
+        uses: charmed-kubernetes/actions-operator@main
+        with:
+          provider: lxd
+          juju-channel: 3.4/candidate
       - name: Run integration
         if: ${{ env.next-test != 'NA' }}
         # Force one single concurrent test
diff --git a/.github/workflows/test_edge.yaml b/.github/workflows/test_edge.yaml
index 37fb262d..2e5afaa7 100644
--- a/.github/workflows/test_edge.yaml
+++ b/.github/workflows/test_edge.yaml
@@ -49,20 +49,17 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
         if: ${{ env.next-test != 'NA' }}
-      - name: Setup operator environment
-        if: ${{ env.next-test != 'NA' }}
-        uses: charmed-kubernetes/actions-operator@main
-        with:
-          provider: lxd
-          juju-channel: 3.4/edge
       - name: Setup Python
         if: ${{ env.next-test != 'NA' }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - name: Install dependencies
+      - name: Setup operator environment
         if: ${{ env.next-test != 'NA' }}
-        run: pip install tox
+        uses: charmed-kubernetes/actions-operator@main
+        with:
+          provider: lxd
+          juju-channel: 3.4/edge
       - name: Run integration
         if: ${{ env.next-test != 'NA' }}
         # Force one single concurrent test