ci: fix individual charm tests

.github/workflows/integrate.yaml

@@ -123,20 +123,13 @@ jobs:
           # Pinned to 3.x/stable due to https://github.com/canonical/charmcraft/issues/1845
           charmcraft-channel: 3.x/stable
 
-      - name: echo things
-        run: |
-          echo $GITHUB_WORKSPACE
-          echo ${{ needs.build.outputs.artifact-prefix }}
-
       - name: Download packed charm(s)
         id: download-charms
         timeout-minutes: 5
         uses: actions/download-artifact@v4
         with:
           pattern: packed-charm-cache-true-.-charms-${{ matrix.charm }}-*
           merge-multiple: true
-          path: ./charms/${{ matrix.charm }}
-
 
       - name: Integration tests
         run: |

charms/kfp-api/tests/integration/test_charm.py

@@ -41,14 +41,15 @@
 MYSQL_TRUST = True
 
 
+@pytest.fixture
+def use_packed_charms() -> str:
+    """Return environment variable `USE_PACKED_CHARMS`. If it's not found, return `false`."""
+    return os.environ.get("USE_PACKED_CHARMS", "false").replace('"', "")
+
+
 class TestCharm:
     """Integration test charm"""
 
-    @pytest.fixture
-    def use_packed_charms() -> str:
-        """Return environment variable `USE_PACKED_CHARMS`. If it's not found, return `false`."""
-        return os.environ.get("USE_PACKED_CHARMS", "false").replace('"', "")
-
     @pytest.mark.abort_on_fail
     async def test_build_and_deploy(self, ops_test: OpsTest, use_packed_charms):
         """Deploy kfp-api with required charms and relations."""

charms/kfp-persistence/tests/integration/test_charm.py

@@ -37,14 +37,15 @@
 MINIO_CONFIG = {"access-key": "minio", "secret-key": "minio-secret-key"}
 
 
+@pytest.fixture
+def use_packed_charms() -> str:
+    """Return environment variable `USE_PACKED_CHARMS`. If it's not found, return `false`."""
+    return os.environ.get("USE_PACKED_CHARMS", "false").replace('"', "")
+
+
 class TestCharm:
     """Integration test charm"""
 
-    @pytest.fixture
-    def use_packed_charms() -> str:
-        """Return environment variable `USE_PACKED_CHARMS`. If it's not found, return `false`."""
-        return os.environ.get("USE_PACKED_CHARMS", "false").replace('"', "")
-
     @pytest.mark.abort_on_fail
     async def test_build_and_deploy(self, ops_test: OpsTest, use_packed_charms):
         """Deploy kfp-persistence with required charms and relations."""