skip: change all

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

@@ -8,5 +8,5 @@
 def pytest_addoption(parser: Parser):
     parser.addoption(
         "--charm-path",
-        help="Path to charm file when downloaded as artefact as a result of build_charm.yaml"
+        help="Path to charm file when downloaded as artefact as a result of build_charm.yaml",
     )

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

@@ -50,7 +50,11 @@ async def test_build_and_deploy(self, ops_test: OpsTest, request):
         resources = {"oci-image": image_path}
         # Keep the option to run the integration tests locally
         # by building the charm and then deploying
-        entity_url =  await ops_test.build_charm("./") if not (entity_url := request.config.getoption("--charm-path")) else entity_url
+        entity_url = (
+            await ops_test.build_charm("./")
+            if not (entity_url := request.config.getoption("--charm-path"))
+            else entity_url
+        )
 
         await ops_test.model.deploy(
             entity_url=entity_url,

charms/kfp-metadata-writer/tests/integration/conftest.py

@@ -8,5 +8,5 @@
 def pytest_addoption(parser: Parser):
     parser.addoption(
         "--charm-path",
-        help="Path to charm file when downloaded as artefact as a result of build_charm.yaml"
+        help="Path to charm file when downloaded as artefact as a result of build_charm.yaml",
     )

charms/kfp-metadata-writer/tests/integration/test_charm.py

@@ -27,30 +27,22 @@
 
 @pytest.mark.abort_on_fail
 async def test_build_and_deploy_with_relations(ops_test: OpsTest, request):
-    built_charm_path = await ops_test.build_charm(CHARM_ROOT)
-    log.info(f"Built charm {built_charm_path}")
-
     image_path = METADATA["resources"]["oci-image"]["upstream-source"]
     resources = {"oci-image": image_path}
+    # Keep the option to run the integration tests locally
+    # by building the charm and then deploying
+    entity_url = (
+        await ops_test.build_charm("./")
+        if not (entity_url := request.config.getoption("--charm-path"))
+        else entity_url
+    )
 
-    if entity_url := request.config.getoption("--charm-path"):
-        await ops_test.model.deploy(
-            entity_url=entity_url,
-            application_name=APP_NAME,
-            resources=resources,
-            trust=True,
-        )
-    else:
-        # Keep the option to run the integration tests locally
-        # by building the charm and then deploying
-        built_charm_path = await ops_test.build_charm("./")
-        logger.info(f"Built charm {built_charm_path}")
-        await ops_test.model.deploy(
-            entity_url=built_charm_path,
-            application_name=APP_NAME,
-            resources=resources,
-            trust=True,
-        )
+    await ops_test.model.deploy(
+        entity_url=entity_url,
+        application_name=APP_NAME,
+        resources=resources,
+        trust=True,
+    )
 
     await ops_test.model.deploy(entity_url=MLMD, channel=MLMD_CHANNEL, trust=True)
     await ops_test.model.integrate(f"{MLMD}:grpc", f"{APP_NAME}:grpc")

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

@@ -8,5 +8,5 @@
 def pytest_addoption(parser: Parser):
     parser.addoption(
         "--charm-path",
-        help="Path to charm file when downloaded as artefact as a result of build_charm.yaml"
+        help="Path to charm file when downloaded as artefact as a result of build_charm.yaml",
     )

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

@@ -41,14 +41,18 @@ class TestCharm:
     @pytest.mark.abort_on_fail
     async def test_build_and_deploy(self, ops_test: OpsTest):
         """Deploy kfp-persistence with required charms and relations."""
-        built_charm_path = await ops_test.build_charm("./")
-        logger.info(f"Built charm {built_charm_path}")
-
         image_path = METADATA["resources"]["oci-image"]["upstream-source"]
         resources = {"oci-image": image_path}
+        # Keep the option to run the integration tests locally
+        # by building the charm and then deploying
+        entity_url = (
+            await ops_test.build_charm("./")
+            if not (entity_url := request.config.getoption("--charm-path"))
+            else entity_url
+        )
 
         await ops_test.model.deploy(
-            entity_url=built_charm_path,
+            entity_url=entity_url,
             application_name=APP_NAME,
             resources=resources,
             trust=True,