fix(toolchains): clean up temp dirs after NODE-950 regression and spe…

…cify a temp dir prefix

toolchains/sysimage/build_disk_image.py

@@ -11,6 +11,7 @@
 #   build_disk_image -p partitions.csv -o disk.img.tar part1.tar part2.tar ...
 #
 import argparse
+import atexit
 import os
 import subprocess
 import sys
@@ -149,7 +150,8 @@ def main():
         gpt_entries = read_partition_description(f.read())
     validate_partition_table(gpt_entries)
 
-    tmpdir = tempfile.mkdtemp()
+    tmpdir = tempfile.mkdtemp(prefix="icosbuild")
+    atexit.register(lambda: subprocess.run(["rm", "-rf", tmpdir], check=True))
 
     disk_image = os.path.join(tmpdir, "disk.img")
     prepare_diskimage(gpt_entries, disk_image)

toolchains/sysimage/build_ext4_image.py

@@ -8,6 +8,7 @@
 #   build_ext4_image -s 10M -o partition.img.tar -p boot -i dockerimg.tar -S file_contexts
 #
 import argparse
+import atexit
 import os
 import shutil
 import subprocess
@@ -235,7 +236,8 @@ def main():
     if limit_prefix and limit_prefix[0] == "/":
         limit_prefix = limit_prefix[1:]
 
-    tmpdir = tempfile.mkdtemp()
+    tmpdir = tempfile.mkdtemp(prefix="icosbuild")
+    atexit.register(lambda: subprocess.run(["rm", "-rf", tmpdir], check=True))
 
     if file_contexts_file:
         original_file_contexts = open(file_contexts_file, "r").read()

toolchains/sysimage/build_fat32_image.py

@@ -8,6 +8,7 @@
 #   build_fat32_image -s 10M -o partition.img.tar -p boot/efi -i dockerimg.tar
 #
 import argparse
+import atexit
 import os
 import subprocess
 import sys
@@ -113,7 +114,8 @@ def main():
     limit_prefix = args.path
     extra_files = args.extra_files
 
-    tmpdir = tempfile.mkdtemp()
+    tmpdir = tempfile.mkdtemp(prefix="icosbuild")
+    atexit.register(lambda: subprocess.run(["rm", "-rf", tmpdir], check=True))
 
     fs_basedir = os.path.join(tmpdir, "fs")
     os.mkdir(fs_basedir)

toolchains/sysimage/build_lvm_image.py

@@ -11,6 +11,7 @@
 #   build_lvm_image -v volumes.csv -o partition-hostlvm.tar part1.tar part2.tar ...
 #
 import argparse
+import atexit
 import os
 import subprocess
 import sys
@@ -51,7 +52,8 @@ def main():
         lvm_entries = read_volume_description(f.read())
     validate_volume_table(lvm_entries)
 
-    tmpdir = tempfile.mkdtemp()
+    tmpdir = tempfile.mkdtemp(prefix="icosbuild")
+    atexit.register(lambda: subprocess.run(["rm", "-rf", tmpdir], check=True))
 
     lvm_image = os.path.join(tmpdir, "partition.img")
     prepare_lvm_image(lvm_entries, lvm_image, vg_name, vg_uuid, pv_uuid)

toolchains/sysimage/build_upgrade_image.py

@@ -6,6 +6,7 @@
 #   build_upgrade_image -o upgrade.tar.gz -b boot.img.tar -r root.img.tar -v version.txt -c gzip
 #
 import argparse
+import atexit
 import shutil
 import subprocess
 import sys
@@ -35,7 +36,8 @@ def main():
     version_file = args.versionfile
     compression = args.compression
 
-    tmpdir = tempfile.mkdtemp()
+    tmpdir = tempfile.mkdtemp(prefix="icosbuild")
+    atexit.register(lambda: subprocess.run(["rm", "-rf", tmpdir], check=True))
 
     subprocess.run(["tar", "xf", boot_image, "--transform=s/partition.img/boot.img/", "-C", tmpdir], check=True)
 

toolchains/sysimage/build_vfat_image.py

@@ -8,6 +8,7 @@
 #   build_vfat_image -s 10M -o partition.img.tar -p boot/efi -i dockerimg.tar
 #
 import argparse
+import atexit
 import os
 import subprocess
 import sys
@@ -111,7 +112,8 @@ def main():
     limit_prefix = args.path
     extra_files = args.extra_files
 
-    tmpdir = tempfile.mkdtemp()
+    tmpdir = tempfile.mkdtemp(prefix="icosbuild")
+    atexit.register(lambda: subprocess.run(["rm", "-rf", tmpdir], check=True))
 
     fs_basedir = os.path.join(tmpdir, "fs")
     os.mkdir(fs_basedir)

toolchains/sysimage/verity_sign.py

@@ -4,6 +4,7 @@
 # and outputs root hash to a separate file.
 #
 import argparse
+import atexit
 import os
 import re
 import subprocess
@@ -38,7 +39,8 @@ def main():
 
     args = parser.parse_args(sys.argv[1:])
 
-    tmpdir = tempfile.mkdtemp()
+    tmpdir = tempfile.mkdtemp(prefix="icosbuild")
+    atexit.register(lambda: subprocess.run(["rm", "-rf", tmpdir], check=True))
 
     subprocess.run(
         [