Skip to content

Commit

Permalink
Ensure that the snap can be reinstalled after cleanup (#823)
Browse files Browse the repository at this point in the history
By removing and reinstalling the snap, we ensure that the snap cleans
up all relevant directories and does not stand in its own way.
  • Loading branch information
bschimke95 authored Nov 25, 2024
1 parent ec2081e commit 8e6ef1f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 73 deletions.
72 changes: 0 additions & 72 deletions build-scripts/hack/upstream-images.yaml

This file was deleted.

5 changes: 4 additions & 1 deletion tests/integration/tests/test_cleanup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


@pytest.mark.node_count(1)
def test_node_cleanup(instances: List[harness.Instance]):
def test_node_cleanup(instances: List[harness.Instance], tmp_path):
instance = instances[0]
util.wait_for_dns(instance)
util.wait_for_network(instance)
Expand All @@ -31,3 +31,6 @@ def test_node_cleanup(instances: List[harness.Instance]):
)
for path in CONTAINERD_PATHS:
assert f"cannot access '{path}': No such file or directory" in process.stderr

util.setup_k8s_snap(instance, tmp_path)
instance.exec(["k8s", "bootstrap"])

0 comments on commit 8e6ef1f

Please sign in to comment.