From 8d7d3f2d504fc4b38c765e65d6b26338e61d3d21 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia <daniela.plascencia@canonical.com> Date: Tue, 10 Dec 2024 04:12:54 +0100 Subject: [PATCH] skip --- .github/workflows/integrate.yaml | 7 ------- .../kfp-metadata-writer/tests/integration/test_charm.py | 8 ++++---- charms/kfp-persistence/tests/integration/test_charm.py | 5 +---- .../tests/integration/test_charm.py | 8 ++++---- charms/kfp-schedwf/tests/integration/test_charm.py | 5 +---- charms/kfp-ui/tests/integration/test_charm.py | 5 +---- charms/kfp-viewer/tests/integration/test_charm.py | 5 +---- charms/kfp-viz/tests/integration/test_charm.py | 5 +---- 8 files changed, 13 insertions(+), 35 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index ba41518c..cd5c686d 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -131,13 +131,6 @@ jobs: merge-multiple: true path: /tmp/ - - name: Debug path - run: | - ls -lh /tmp/ - echo "---------------" - ls -lh - echo "---------------" - ls -lh /tmp/packed-charm-cache-true-.-charms-kfp-api-base-0/charms/kfp-api/ - name: Integration tests run: | # Requires the model to be called kubeflow due to diff --git a/charms/kfp-metadata-writer/tests/integration/test_charm.py b/charms/kfp-metadata-writer/tests/integration/test_charm.py index 0f0d5d77..0c059c45 100644 --- a/charms/kfp-metadata-writer/tests/integration/test_charm.py +++ b/charms/kfp-metadata-writer/tests/integration/test_charm.py @@ -27,14 +27,14 @@ @pytest.mark.abort_on_fail async def test_build_and_deploy_with_relations(ops_test: OpsTest): - 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} await ops_test.model.deploy( - entity_url=built_charm_path, application_name=APP_NAME, resources=resources, trust=True + entity_url="/tmp/charms/kfp-metadata-writer/kfp-metadata-writer_ubuntu-20.04-amd64.charm", + 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") diff --git a/charms/kfp-persistence/tests/integration/test_charm.py b/charms/kfp-persistence/tests/integration/test_charm.py index bd0c3882..e5d3bc69 100644 --- a/charms/kfp-persistence/tests/integration/test_charm.py +++ b/charms/kfp-persistence/tests/integration/test_charm.py @@ -41,14 +41,11 @@ 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} await ops_test.model.deploy( - entity_url=built_charm_path, + entity_url="/tmp/charms/kfp-persistence/kfp-persistence_ubuntu-20.04-amd64.charm", application_name=APP_NAME, resources=resources, trust=True, diff --git a/charms/kfp-profile-controller/tests/integration/test_charm.py b/charms/kfp-profile-controller/tests/integration/test_charm.py index 1160bdbf..ba522f01 100644 --- a/charms/kfp-profile-controller/tests/integration/test_charm.py +++ b/charms/kfp-profile-controller/tests/integration/test_charm.py @@ -49,9 +49,6 @@ @pytest.mark.abort_on_fail async def test_build_and_deploy(ops_test: OpsTest): - 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} @@ -73,7 +70,10 @@ async def test_build_and_deploy(ops_test: OpsTest): ) await ops_test.model.deploy( - built_charm_path, application_name=CHARM_NAME, resources=resources, trust=True + entity_url="/tmp/charms/kfp-profile-controller/kfp-profile-controller_ubuntu-20.04-amd64.charm", + application_name=CHARM_NAME, + resources=resources, + trust=True ) # Deploy required relations diff --git a/charms/kfp-schedwf/tests/integration/test_charm.py b/charms/kfp-schedwf/tests/integration/test_charm.py index 64d8c229..110e6a71 100644 --- a/charms/kfp-schedwf/tests/integration/test_charm.py +++ b/charms/kfp-schedwf/tests/integration/test_charm.py @@ -22,14 +22,11 @@ @pytest.mark.abort_on_fail async def test_build_and_deploy_with_relations(ops_test: OpsTest): - 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} await ops_test.model.deploy( - entity_url=built_charm_path, application_name=APP_NAME, resources=resources, trust=True + entity_url="/tmp/charms/kfp-schedwf/kfp-schedwf_ubuntu-20.04-amd64.charm", application_name=APP_NAME, resources=resources, trust=True ) await ops_test.model.wait_for_idle( diff --git a/charms/kfp-ui/tests/integration/test_charm.py b/charms/kfp-ui/tests/integration/test_charm.py index 02c59c4e..d59b9258 100644 --- a/charms/kfp-ui/tests/integration/test_charm.py +++ b/charms/kfp-ui/tests/integration/test_charm.py @@ -23,14 +23,11 @@ @pytest.mark.abort_on_fail async def test_build_and_deploy_with_relations(ops_test: OpsTest): - built_charm_path = await ops_test.build_charm(CHARM_ROOT) - log.info(f"Built charm {built_charm_path}") - image_path = METADATA["resources"]["ml-pipeline-ui"]["upstream-source"] resources = {"ml-pipeline-ui": image_path} await ops_test.model.deploy( - entity_url=built_charm_path, application_name=APP_NAME, resources=resources, trust=True + entity_url="/tmp/charms/kfp-ui/kfp-ui_ubuntu-20.04-amd64.charm", application_name=APP_NAME, resources=resources, trust=True ) await ops_test.model.deploy(BUNDLE, trust=True) await ops_test.model.integrate(f"{APP_NAME}:kfp-api", "kfp-api:kfp-api") diff --git a/charms/kfp-viewer/tests/integration/test_charm.py b/charms/kfp-viewer/tests/integration/test_charm.py index c96f8794..2a4479ba 100644 --- a/charms/kfp-viewer/tests/integration/test_charm.py +++ b/charms/kfp-viewer/tests/integration/test_charm.py @@ -22,14 +22,11 @@ @pytest.mark.abort_on_fail async def test_build_and_deploy_with_relations(ops_test: OpsTest): - built_charm_path = await ops_test.build_charm(CHARM_ROOT) - log.info(f"Built charm {built_charm_path}") - image_path = METADATA["resources"]["kfp-viewer-image"]["upstream-source"] resources = {"kfp-viewer-image": image_path} await ops_test.model.deploy( - entity_url=built_charm_path, application_name=APP_NAME, resources=resources, trust=True + entity_url="/tmp/charms/kfp-viewer/kfp-viewer_ubuntu-20.04-amd64.charm", application_name=APP_NAME, resources=resources, trust=True ) await ops_test.model.wait_for_idle( apps=[APP_NAME], diff --git a/charms/kfp-viz/tests/integration/test_charm.py b/charms/kfp-viz/tests/integration/test_charm.py index 7eb9b68f..85097ca8 100644 --- a/charms/kfp-viz/tests/integration/test_charm.py +++ b/charms/kfp-viz/tests/integration/test_charm.py @@ -22,14 +22,11 @@ @pytest.mark.abort_on_fail async def test_build_and_deploy_with_relations(ops_test: OpsTest): - 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} await ops_test.model.deploy( - entity_url=built_charm_path, application_name=APP_NAME, resources=resources, trust=True + entity_url="/tmp/charms/kfp-viz/kfp-viz_ubuntu-20.04-amd64.charm", application_name=APP_NAME, resources=resources, trust=True ) await ops_test.model.wait_for_idle( apps=[APP_NAME],