mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-11 01:24:20 +00:00
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 <awilliam@redhat.com>
This commit is contained in:
parent
76bce2bc04
commit
531df88d37
@ -99,7 +99,7 @@ sub run {
|
|||||||
# now copy the descriptions in
|
# now copy the descriptions in
|
||||||
assert_script_run "mock -r openqa --isolation=simple --copyin fedora-kiwi-descriptions /fedora-kiwi-descriptions";
|
assert_script_run "mock -r openqa --isolation=simple --copyin fedora-kiwi-descriptions /fedora-kiwi-descriptions";
|
||||||
# PULL SOME LEVERS! PULL SOME LEVERS!
|
# 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) {
|
unless (script_run "mock -r openqa --isolation=simple --copyout /tmp/image-root.log .", 90) {
|
||||||
upload_logs "image-root.log";
|
upload_logs "image-root.log";
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user