Bump the test-container version to trigger a rebuild after upgrading
kas to 5.4.
Adjust scripts/run-tests.sh to match kas 5.4.
Signed-off-by: Zhihang Wei <
w...@ilbers.de>
---
scripts/run-tests.sh | 7 +------
testsuite/dockerdata/version | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index bce10d70..af67a395 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -8,11 +8,6 @@ ISAR_DIR=$(readlink -f $(dirname $0)/..)
TEST_CONTAINER_VERSION=$(cat ${ISAR_DIR}/testsuite/dockerdata/version)
-# The way to do this after kas 5.2:
-# export KAS_CONTAINER_IMAGE="${CONTAINER_BASENAME:-
ghcr.io/ilbers/isar}/test-container:$TEST_CONTAINER_VERSION"
-#
-# For now:
-export KAS_CONTAINER_IMAGE_DISTRO="container:$TEST_CONTAINER_VERSION"
-export KAS_CONTAINER_IMAGE=${CONTAINER_BASENAME:-
ghcr.io/ilbers/isar}/test
+export KAS_CONTAINER_IMAGE="${CONTAINER_BASENAME:-
ghcr.io/ilbers/isar}/test-container:$TEST_CONTAINER_VERSION"
${ISAR_DIR}/kas/kas-container --isar --repo-ro shell -c "$*"
diff --git a/testsuite/dockerdata/version b/testsuite/dockerdata/version
index d00491fd..0cfbf088 100644
--- a/testsuite/dockerdata/version
+++ b/testsuite/dockerdata/version
@@ -1 +1 @@
-1
+2
--
2.39.5