From c0a9b616ef5beed250973fc0b748e4f70b748ea3 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Tue, 22 Feb 2022 16:22:57 +0100 Subject: [PATCH 1/3] ci-automation: publish test results, add to GC This change adds copying test results to the build cache server, and adds respective deletion to the garbage collector. Also, the patch fixes an issue with torcx publishing (manifest publishing had arch hard-coded). Signed-off-by: Thilo Fromm --- ci-automation/garbage_collect.sh | 1 + ci-automation/packages.sh | 2 +- ci-automation/test.sh | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ci-automation/garbage_collect.sh b/ci-automation/garbage_collect.sh index 59ff8e8d42..cdc7d289cc 100644 --- a/ci-automation/garbage_collect.sh +++ b/ci-automation/garbage_collect.sh @@ -92,6 +92,7 @@ function garbage_collect() { rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/boards/*/${os_vernum}/" rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-images-*" rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/images/*/${os_vernum}/" + rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/testing/${os_vernum}/" fi echo "## The following files will be removed ##" diff --git a/ci-automation/packages.sh b/ci-automation/packages.sh index adad0e0b70..107b36cbca 100644 --- a/ci-automation/packages.sh +++ b/ci-automation/packages.sh @@ -123,7 +123,7 @@ function packages_build() { # Publish torcx manifest and docker tarball to "images" cache so tests can pull it later. copy_to_buildcache "images/${arch}/${vernum}/torcx" \ - "${torcx_tmp}/torcx/amd64-usr/latest/torcx_manifest.json" + "${torcx_tmp}/torcx/${arch}-usr/latest/torcx_manifest.json" copy_to_buildcache "images/${arch}/${vernum}/torcx" \ "${torcx_tmp}/torcx/pkgs/${arch}-usr/docker/"*/*.torcx.tgz diff --git a/ci-automation/test.sh b/ci-automation/test.sh index 07df9ca2fc..a98430a2cd 100644 --- a/ci-automation/test.sh +++ b/ci-automation/test.sh @@ -176,9 +176,10 @@ function test_run() { echo "########### All re-runs exhausted ($retries). Giving up. ###########" fi - # TODO: publish to bincache? - # "${tests_dir}/"*.tap - # "${tests_dir}/_kola_temp.tar.xz" - + # publish TAP files to buold cache + copy_to_buildcache "testing/${vernum}/${arch}/${image}" \ + "${tests_dir}/"*.tap + copy_to_buildcache "testing/${vernum}/${arch}/${image}/debug" \ + "${tests_dir}/_kola_temp/"* } # -- From 2e9f5c79e198f31d36cb8a1036af124c2e1e6b31 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Tue, 22 Feb 2022 18:13:15 +0100 Subject: [PATCH 2/3] Update ci-automation/test.sh: fix typo. Co-authored-by: Jeremi Piotrowski --- ci-automation/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-automation/test.sh b/ci-automation/test.sh index a98430a2cd..9fa520cb0b 100644 --- a/ci-automation/test.sh +++ b/ci-automation/test.sh @@ -176,7 +176,7 @@ function test_run() { echo "########### All re-runs exhausted ($retries). Giving up. ###########" fi - # publish TAP files to buold cache + # publish TAP files to build cache copy_to_buildcache "testing/${vernum}/${arch}/${image}" \ "${tests_dir}/"*.tap copy_to_buildcache "testing/${vernum}/${arch}/${image}/debug" \ From 92dd6b086ccb12f8c51230e3ad239777de00e842 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Tue, 22 Feb 2022 18:23:52 +0100 Subject: [PATCH 3/3] ci-automation/test.sh: publish to _kola_tmp, not debug/_kola_tmp Signed-off-by: Thilo Fromm --- ci-automation/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-automation/test.sh b/ci-automation/test.sh index 9fa520cb0b..7921d79d36 100644 --- a/ci-automation/test.sh +++ b/ci-automation/test.sh @@ -179,7 +179,7 @@ function test_run() { # publish TAP files to build cache copy_to_buildcache "testing/${vernum}/${arch}/${image}" \ "${tests_dir}/"*.tap - copy_to_buildcache "testing/${vernum}/${arch}/${image}/debug" \ - "${tests_dir}/_kola_temp/"* + copy_to_buildcache "testing/${vernum}/${arch}/${image}" \ + "${tests_dir}/_kola_temp" } # --