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
vmware · Sep 13, 2024 · 37144cd · 37144cd
2 parents c5f234b + bab7e7d
commit 37144cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/examples/ova/minimal_ks.yaml b/examples/ova/minimal_ks.yaml
@@ -33,8 +33,6 @@ linux_flavor: linux
 
 eject_cdrom: false
 
-manifest_file: minimal_mf.json
-
 network:
     version: "2"
     nameservers:

diff --git a/tests/poi-container-test.py b/tests/poi-container-test.py
@@ -23,9 +23,9 @@ def create_repo_path():
 
 
 def remove_build_images(directory):
-    extensions = ["*.vhd.tar.gz", "*.ova", "*.ovf", "*.mf", "*.raw", "*.img"]
+    patterns = ["*.vhd.tar.gz", "*.ova", "*.ovf", "*.mf", "*.raw", "*.img", "poi-manifest.json"]
 
-    files = [file for ext in extensions for file in glob.glob(f"{directory}/{ext}")]
+    files = [file for pattern in patterns for file in glob.glob(f"{directory}/{pattern}")]
     for file in files:
         try:
             os.remove(file)