From 8157bf0302d0ced1e310ede80d6220f9ceed1a3b Mon Sep 17 00:00:00 2001
From: Thilo Fromm <thilo@kinvolk.io>
Date: Tue, 22 Feb 2022 16:22:57 +0100
Subject: [PATCH] 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 <thilo@kinvolk.io>
---
 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/"*
 }
 # --