Skip to content

Commit 37144cd

Browse files
committed
Merge branch 'topic/okurth/pytest-fix-cleanup' into 'master'
pytest: add poi-manifest.json to files to cleanup See merge request core-build/photon-os-installer!90
2 parents c5f234b + bab7e7d commit 37144cd

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

examples/ova/minimal_ks.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ linux_flavor: linux
3333

3434
eject_cdrom: false
3535

36-
manifest_file: minimal_mf.json
37-
3836
network:
3937
version: "2"
4038
nameservers:

tests/poi-container-test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ def create_repo_path():
2323

2424

2525
def remove_build_images(directory):
26-
extensions = ["*.vhd.tar.gz", "*.ova", "*.ovf", "*.mf", "*.raw", "*.img"]
26+
patterns = ["*.vhd.tar.gz", "*.ova", "*.ovf", "*.mf", "*.raw", "*.img", "poi-manifest.json"]
2727

28-
files = [file for ext in extensions for file in glob.glob(f"{directory}/{ext}")]
28+
files = [file for pattern in patterns for file in glob.glob(f"{directory}/{pattern}")]
2929
for file in files:
3030
try:
3131
os.remove(file)

0 commit comments

Comments
 (0)