From 531df88d372676ebcb7d35591c1ca0c6eee10d1c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 22 Aug 2024 10:37:12 -0700 Subject: [PATCH] container build: fix kiwi command to include --kiwi-file This is now required (config.xml is gone), and Koji has been doing it for a while. Koji uses a modified file it writes before calling kiwi-ng, but we just use the stock one here. Signed-off-by: Adam Williamson --- tests/_container_build_kiwi.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_container_build_kiwi.pm b/tests/_container_build_kiwi.pm index c10aba7c..ccf2efec 100644 --- a/tests/_container_build_kiwi.pm +++ b/tests/_container_build_kiwi.pm @@ -99,7 +99,7 @@ sub run { # now copy the descriptions in assert_script_run "mock -r openqa --isolation=simple --copyin fedora-kiwi-descriptions /fedora-kiwi-descriptions"; # PULL SOME LEVERS! PULL SOME LEVERS! - assert_script_run "mock -r openqa --enable-network --chroot \"kiwi-ng --profile Container-Base-Generic --debug --logfile /tmp/image-root.log system build --description /fedora-kiwi-descriptions/ --target-dir /builddir/result/image\"", 7200; + assert_script_run "mock -r openqa --enable-network --chroot \"kiwi-ng --profile Container-Base-Generic --kiwi-file Fedora.kiwi --debug --logfile /tmp/image-root.log system build --description /fedora-kiwi-descriptions/ --target-dir /builddir/result/image\"", 7200; unless (script_run "mock -r openqa --isolation=simple --copyout /tmp/image-root.log .", 90) { upload_logs "image-root.log"; }