From e076931c7da4272c4cf883b9d55a61d87c460c60 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Mon, 10 Jan 2022 13:58:32 +0100 Subject: [PATCH] ci-automation/garbage_collect: fix binpkg url garbage_collect.sh was using 'docker_vernum' where it should have been using 'vernum' (as push_pkgs.sh does). Also, make sure release directories are removed, not just packages. Signed-off-by: Thilo Fromm --- ci-automation/garbage_collect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-automation/garbage_collect.sh b/ci-automation/garbage_collect.sh index 02003ac6b9..1ee38f6215 100644 --- a/ci-automation/garbage_collect.sh +++ b/ci-automation/garbage_collect.sh @@ -89,7 +89,7 @@ function garbage_collect() { else echo "## ${version} is an OS image version. ##" rmpat="${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-packages-*" - rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/binpkgs/boards/*/${os_docker_vernum}/*" + rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/binpkgs/boards/*/${os_vernum}/" rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-images-*" rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/images/*/${os_vernum}/" fi