ci: apply the same fix to candidate and edge testing actions

juju · Oct 9, 2024 · a4ce7ad · a4ce7ad
1 parent 5eabac4
commit a4ce7ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git 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
@@ -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