From 6286b0a442ac89c9ae21798a1af88a2dbbeabb50 Mon Sep 17 00:00:00 2001
From: Thilo Fromm <thilo@kinvolk.io>
Date: Wed, 16 Mar 2022 14:08:31 +0100
Subject: [PATCH] ci-automation/test.sh: use the latest kola from
 coreos-overlay

---
 ci-automation/test.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ci-automation/test.sh b/ci-automation/test.sh
index 563c07fe54..509079b5ab 100644
--- a/ci-automation/test.sh
+++ b/ci-automation/test.sh
@@ -136,6 +136,13 @@ function test_run() {
     # Make the torcx artifacts available to test implementation
     __prepare_torcx "${arch}" "${vernum}" "${work_dir}"
 
+    # Ensure we run tests with an up-to-date kola.
+    # This covers the case of a mantle/kola commit ID in the ebuild being
+    #  newer than the mantle/kola included in the SDK.
+    ./run_sdk_container -x ./ci-cleanup.sh \
+        -n "${container_name}" -C "${sdk_image}" -v "${vernum}" \
+        sudo emerge mantle
+
     # Pass PARALLEL_TESTS to the container
     if [ -n "${PARALLEL_TESTS-}" ] ; then
         echo "PARALLEL_TESTS=\"${PARALLEL_TESTS}\"" > sdk_container/.env