From e5965b2aa4ad6de841bc1e844aa2ef2198a93663 Mon Sep 17 00:00:00 2001
From: Paul Spooren <mail@aparcar.org>
Date: Sat, 10 Sep 2022 21:39:40 +0200
Subject: [PATCH] build: cleanup KDIR_TMP after each build

Clean the KDIR_TMP folder after each build since it stores every image
ever created.

Also run isort and black.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---
 asu/build.py                                  |  26 ++++++++++++++++--
 tests/test_api.py                             |  21 ++++++++++++++
 ...sttarget-testsubtarget.Linux-x86_64.tar.xz | Bin 2348 -> 2475 bytes
 .../Makefile                                  |   3 ++
 .../pseudo_kernel_build_dir/tmp/fake_trash    |   0
 .../testtarget/testsubtarget/sha256sums       |   2 +-
 .../testtarget/testsubtarget/sha256sums.sig   |   2 +-
 7 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64/pseudo_kernel_build_dir/tmp/fake_trash

diff --git a/asu/build.py b/asu/build.py
index 96c44681..0cedee8b 100644
--- a/asu/build.py
+++ b/asu/build.py
@@ -9,8 +9,12 @@
 import requests
 from rq import get_current_job
 
-from .common import (fingerprint_pubkey_usign, get_file_hash,
-                     get_packages_hash, verify_usign)
+from .common import (
+    fingerprint_pubkey_usign,
+    get_file_hash,
+    get_packages_hash,
+    verify_usign,
+)
 
 log = logging.getLogger("rq.worker")
 log.setLevel(logging.DEBUG)
@@ -338,6 +342,24 @@ def download_file(filename: str, dest: str = None):
     if "is too big" in image_build.stderr:
         report_error("Selected packages exceed device storage")
 
+    kernel_build_dir_run = subprocess.run(
+        ["make", "val.KERNEL_BUILD_DIR"],
+        text=True,
+        cwd=cache_workdir,
+        capture_output=True,
+    )
+
+    if kernel_build_dir_run.returncode:
+        report_error("Couldn't determine KERNEL_BUILD_DIR")
+
+    kernel_build_dir_tmp = Path(kernel_build_dir_run.stdout.strip()) / "tmp"
+
+    if kernel_build_dir_tmp.exists():
+        log.info("Removing KDIR_TMP at %s", kernel_build_dir_tmp)
+        rmtree(kernel_build_dir_tmp)
+    else:
+        log.warning("KDIR_TMP missing at %s", kernel_build_dir_tmp)
+
     json_file = Path(req["store_path"] / bin_dir / "profiles.json")
 
     if not json_file.is_file():
diff --git a/tests/test_api.py b/tests/test_api.py
index ea191313..2f8c0b89 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -518,3 +518,24 @@ def test_api_build_package_to_replace(client, upstream):
     )
     assert response.status == "200 OK"
     assert response.json.get("request_hash") == "8dd81d51057d322b46aa3739ccf4a8a6"
+
+
+def test_api_build_cleanup(app, upstream):
+    client = app.test_client()
+    response = client.post(
+        "/api/v1/build",
+        json=dict(
+            version="TESTVERSION",
+            target="testtarget/testsubtarget",
+            profile="testprofile",
+            packages=["test1", "test2"],
+            filesystem="ext4",
+        ),
+    )
+    assert response.status == "200 OK"
+    assert not (
+        app.config["CACHE_PATH"]
+        / "cache/TESTVERSION/testtarget/testsubtarget"
+        / "pseudo_kernel_build_dir/tmp/"
+        / "fake_trash"
+    ).exists()
diff --git a/tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64.tar.xz b/tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64.tar.xz
index 3277025ac771160994f08d450b68cda3768ac779..254ae6452288c4423e1f39e1a0d41478569811c3 100644
GIT binary patch
literal 2475
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

literal 2348
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
S&*iy1`SKrv&l#ZrHUIzw7s`VG

diff --git a/tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64/Makefile b/tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64/Makefile
index 3cd7d9e1..625d4f9e 100644
--- a/tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64/Makefile
+++ b/tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64/Makefile
@@ -9,3 +9,6 @@ manifest:
 
 info:
 	@cat ./openwrt-testtarget-testsubtarget-testprofile.info
+
+val.KERNEL_BUILD_DIR:
+	@echo "$$(pwd)/pseudo_kernel_build_dir/"
diff --git a/tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64/pseudo_kernel_build_dir/tmp/fake_trash b/tests/upstream/snapshots/targets/testtarget/testsubtarget/openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64/pseudo_kernel_build_dir/tmp/fake_trash
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/upstream/snapshots/targets/testtarget/testsubtarget/sha256sums b/tests/upstream/snapshots/targets/testtarget/testsubtarget/sha256sums
index b9edb4d8..35fe96fb 100644
--- a/tests/upstream/snapshots/targets/testtarget/testsubtarget/sha256sums
+++ b/tests/upstream/snapshots/targets/testtarget/testsubtarget/sha256sums
@@ -1 +1 @@
-f7a57262cde30d84db51d6db5b1eee16f5c0525e67f01dcbe10a9693e3c88fde *openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64.tar.xz
+4e645577d934129a65d0f79cf55d90e1199f5ab90ab27803cefae8badc868599 *openwrt-imagebuilder-testtarget-testsubtarget.Linux-x86_64.tar.xz
diff --git a/tests/upstream/snapshots/targets/testtarget/testsubtarget/sha256sums.sig b/tests/upstream/snapshots/targets/testtarget/testsubtarget/sha256sums.sig
index 9edfbf77..6999e851 100644
--- a/tests/upstream/snapshots/targets/testtarget/testsubtarget/sha256sums.sig
+++ b/tests/upstream/snapshots/targets/testtarget/testsubtarget/sha256sums.sig
@@ -1,2 +1,2 @@
 untrusted comment: verify with testkey.pub
-RWRqylWEtrAZQ/BrgCkjQaOak7bVi7CWfwKbK/rKK39w4e0l7jL+D23xAZZXS3Qb/x6jwulK3lbuCU61etNGaLE2KxWfk1hY4QM=
+RWRqylWEtrAZQwwqVGXn0U/Q3nnrboIdIVK2aW7Q8JMN3pmCzHa8o5MppWUqMhxh/h2Dc/3WUjVtWgvfDGrR0tJJ/Wauy9r7QwM=