runners: clean up temp files before exiting the runner

Clean up created temp files before exiting the runner.
mmartinv · Nov 22, 2023 · 795e82e · 795e82e
1 parent 95a1c5b
commit 795e82e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/osbuild/util/runners.py b/osbuild/util/runners.py
@@ -61,6 +61,10 @@ def tmpfiles():
     subprocess.run(["systemd-tmpfiles", "--create"], check=False)
 
 
+def remove_tmpfiles():
+    subprocess.run(["systemd-tmpfiles", "--clean", "--remove"], check=False)
+
+
 def nsswitch():
     # the default behavior is fine, but using nss-resolve does not
     # necessarily work in a non-booted container, so make sure that
@@ -89,7 +93,8 @@ def sequoia():
     # images).
     os.makedirs("/etc/crypto-policies", exist_ok=True)
     shutil.copytree(
-        "/usr/share/crypto-policies/back-ends/DEFAULT", "/etc/crypto-policies/back-ends"
+        "/usr/share/crypto-policies/back-ends/DEFAULT",
+        "/etc/crypto-policies/back-ends"
     )
 
 

diff --git a/runners/org.osbuild.centos9 b/runners/org.osbuild.centos9
@@ -14,5 +14,6 @@ if __name__ == "__main__":
             runners.tmpfiles()
             runners.nsswitch()
             r = subprocess.run(sys.argv[1:], check=False)
+            runners.remove_tmpfiles()
 
         sys.exit(r.returncode)
diff --git a/runners/org.osbuild.fedora30 b/runners/org.osbuild.fedora30
@@ -14,5 +14,6 @@ if __name__ == "__main__":
             runners.tmpfiles()
             runners.nsswitch()
             r = subprocess.run(sys.argv[1:], check=False)
+            runners.remove_tmpfiles()
 
         sys.exit(r.returncode)
diff --git a/runners/org.osbuild.fedora38 b/runners/org.osbuild.fedora38
@@ -15,5 +15,6 @@ if __name__ == "__main__":
             runners.nsswitch()
             runners.sequoia()
             r = subprocess.run(sys.argv[1:], check=False)
+            runners.remove_tmpfiles()
 
         sys.exit(r.returncode)
diff --git a/runners/org.osbuild.rhel81 b/runners/org.osbuild.rhel81
@@ -41,5 +41,6 @@ if __name__ == "__main__":
             os_release()
             runners.python_alternatives()
             r = subprocess.run(sys.argv[1:], check=False)
+            runners.remove_tmpfiles()
 
         sys.exit(r.returncode)
diff --git a/runners/org.osbuild.rhel82 b/runners/org.osbuild.rhel82
@@ -16,5 +16,6 @@ if __name__ == "__main__":
             runners.python_alternatives()
             env = runners.quirks()
             r = subprocess.run(sys.argv[1:], env=env, check=False)
+            runners.remove_tmpfiles()
 
         sys.exit(r.returncode)