[YUNIKORN-1880] Add clean target to image builds (#155)

Closes: #155
apache · Aug 10, 2023 · d52c05f · d52c05f
1 parent e9877ba
commit d52c05f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/release-top-level-artifacts/Makefile b/release-top-level-artifacts/Makefile
@@ -52,3 +52,15 @@ test:
 .PHONY: arch
 arch:
 	@eval "$(MAKE) -C $(SHIM_DIR) arch"
+
+.PHONY: clean
+clean:
+	$(MAKE) -C $(CORE_DIR) clean
+	$(MAKE) -C $(SHIM_DIR) clean
+	$(MAKE) -C $(WEB_DIR) clean
+
+.PHONY: distclean
+distclean:
+	$(MAKE) -C $(CORE_DIR) distclean
+	$(MAKE) -C $(SHIM_DIR) distclean
+	$(MAKE) -C $(WEB_DIR) distclean
diff --git a/tools/build-image.py b/tools/build-image.py
@@ -201,7 +201,7 @@ def build_image(base_dir, image, arch, version):
     my_env["VERSION"] = version      # force version, just be safe
     my_env["HOST_ARCH"] = arch       # the architecture override
     my_env["REGISTRY"] = repository  # repository override (test only)
-    command = [cmd, image]
+    command = [cmd, "clean", image]
     # build the image using make
     retcode = subprocess.call(command, cwd=base_dir, env=my_env, stdout=subprocess.DEVNULL)
     if retcode: