remove CACHE_PATH for workers

running multiple workers causes issues, instead give every worker its
own cache path within the currently working directory.

Signed-off-by: Paul Spooren <mail@aparcar.org>

asu/api.py

@@ -320,7 +320,6 @@ def api_build():
             return response, status
 
         req["store_path"] = current_app.config["STORE_PATH"]
-        req["cache_path"] = current_app.config["CACHE_PATH"]
         req["upstream_url"] = current_app.config["UPSTREAM_URL"]
         req["branch_data"] = get_branches()[req["branch"]]
 

asu/build.py

@@ -74,7 +74,7 @@ def build(req: dict):
     job = get_current_job()
 
     log.debug(f"Building {req}")
-    cache = (req["cache_path"] / req["version"] / req["target"]).parent
+    cache = (Path.cwd() / "cache" / req["version"] / req["target"]).parent
     target, subtarget = req["target"].split("/")
     sums_file = Path(cache / f"{subtarget}_sums")
     sig_file = Path(cache / f"{subtarget}_sums.sig")

misc/config.py

@@ -13,9 +13,6 @@
 # where to store JSON files
 JSON_PATH = Path.cwd() / "public/json/"
 
-# where to store ImageBuilders
-CACHE_PATH = Path.cwd() / "cache/"
-
 # supported versions
 BRANCHES = [
     {

tests/conftest.py

@@ -47,7 +47,6 @@ def app(redis):
     test_path = tempfile.mkdtemp()
     app = create_app(
         {
-            "CACHE_PATH": test_path + "/cache",
             "JSON_PATH": test_path + "/json",
             "REDIS_CONN": redis,
             "STORE_PATH": test_path + "/store",

tests/test_build.py

@@ -34,7 +34,6 @@ def test_build_fake(app, upstream):
         },
         target="testtarget/testsubtarget",
         store_path=app.config["STORE_PATH"],
-        cache_path=app.config["CACHE_PATH"],
         upstream_url="http://localhost:8001",
         version="SNAPSHOT",
         profile="testprofile",
@@ -54,7 +53,6 @@ def test_build_fake_diff_packages(app, upstream):
         },
         target="testtarget/testsubtarget",
         store_path=app.config["STORE_PATH"],
-        cache_path=app.config["CACHE_PATH"],
         upstream_url="http://localhost:8001",
         version="SNAPSHOT",
         profile="testprofile",
@@ -77,7 +75,6 @@ def test_build_fake_store_path_not_exists(app, upstream):
         },
         target="testtarget/testsubtarget",
         store_path=app.config["STORE_PATH"],
-        cache_path=app.config["CACHE_PATH"],
         upstream_url="http://localhost:8001",
         version="SNAPSHOT",
         profile="testprofile",
@@ -98,7 +95,6 @@ def test_build_real(app, httpserver: HTTPServer):
         },
         target="ath79/generic",
         store_path=app.config["STORE_PATH"],
-        cache_path=app.config["CACHE_PATH"],
         upstream_url="https://downloads.cdn.openwrt.org",
         version="SNAPSHOT",
         profile="tplink_tl-wdr4300-v1",

tests/test_factory.py

@@ -5,10 +5,8 @@
 def test_pathlib(app):
     assert isinstance(app.config["STORE_PATH"], PosixPath)
     assert isinstance(app.config["JSON_PATH"], PosixPath)
-    assert isinstance(app.config["CACHE_PATH"], PosixPath)
     assert app.config["STORE_PATH"].is_dir()
     assert app.config["JSON_PATH"].is_dir()
-    assert app.config["CACHE_PATH"].is_dir()
 
 
 def test_other(app):