From 3526fdc944efd14fb62c88e2e93fa47a72a371e7 Mon Sep 17 00:00:00 2001
From: Mia Altieri <mgaltier200@gmail.com>
Date: Mon, 15 Jul 2024 11:30:22 +0000
Subject: [PATCH] fix int tests

---
 .github/workflows/build.yaml       |  1 -
 .github/workflows/integration.yaml | 35 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 60c1364..3e032e7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,7 +2,6 @@ name: Build Charmed MongoDB rock
 
 on:
   workflow_call:
-  pull_request:
 
 jobs:
   build:
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 5514382..b1d7f6b 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -11,7 +11,9 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build.yaml
+    name: Build rock
+    uses: canonical/data-platform-workflows/.github/workflows/build_rock.yaml@v16
+
   integration:
     runs-on: ubuntu-latest
     timeout-minutes: 120
@@ -27,29 +29,31 @@ jobs:
         uses: charmed-kubernetes/actions-operator@main
         with:
           provider: microk8s
-          channel: "1.27-strict/stable"
+          channel: "1.29-strict/stable"
           bootstrap-constraints: "cores=2 mem=2G"
           juju-channel: 3.1/stable
           # This is needed until
           # https://bugs.launchpad.net/juju/+bug/1977582 is fixed
-          bootstrap-options: "--agent-version 3.1.6"
-      - name: Pin charmcraft version
-        run: |
-          sudo snap refresh  charmcraft --classic --revision 1349
-          sudo snap refresh charmcraft --hold=forever
+          bootstrap-options: "--agent-version 3.1.7"
       - name: Install rockcraft
         run: |
           sudo snap install rockcraft --classic --revision 1206
           sudo snap refresh rockcraft --hold=forever
-      - uses: actions/download-artifact@v3
+      - name: Download rock package(s)
+        uses: actions/download-artifact@v4
         with:
-          name: mongodb-rock
-      - name: Install tox
-        run: python3 -m pip install tox
-
+          pattern: ${{ needs.build.outputs.artifact-prefix }}-*
+          merge-multiple: true
+      - name: Install tox & poetry
+        run: |
+          pipx install tox
+          pipx install poetry
+      - name: Integration Tests
+        run: |
+          sg snap_microk8s -c "tox -e ${{ matrix.env }}"
       - name: Free disk space
         run: |
-          echo "Free disk space before cleanup"
+          echo "Free disk space after int tests"
           df -T
           # free space in the runner
           rockcraft clean
@@ -57,8 +61,5 @@ jobs:
           sudo rm -rf /opt/ghc
           sudo rm -rf /usr/local/share/boost
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-          echo "Free disk space after cleanup"
+          echo "Free disk after int tests"
           df -T
-      
-      - name: Integration Tests
-        run: sg snap_microk8s -c "tox -e ${{ matrix.env }}"