From 886a22c35fdb528e89bc6bf06de6a1ae3b8716f8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 4 Nov 2020 11:42:13 -0800 Subject: [PATCH] arm image deploy: don't use HDD_1 Setting HDD_1 to %HDD_2% is broken in recent openQA: https://github.com/os-autoinst/openQA/pull/3309#issuecomment-721906935 I count this as a bug, but we can solve it like this, I think - we don't actually need to set this test up so carefully to only have the disk image as HDD_1 and no HDD_2, we can actually just let the disk image be HDD_2 and have an empty disk as HDD_1 and the test still works, qemu will boot from the second disk and we can upload it and everything's fine. So let's just go with that. Signed-off-by: Adam Williamson --- main.pm | 2 +- templates.fif.json | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/main.pm b/main.pm index 8b36feb7..b5548b82 100644 --- a/main.pm +++ b/main.pm @@ -343,7 +343,7 @@ sub load_postinstall_tests() { } # we should shut down before uploading disk images - if (get_var("STORE_HDD_1") || get_var("PUBLISH_HDD_1")) { + if (get_var("STORE_HDD_1") || get_var("STORE_HDD_2") || get_var("PUBLISH_HDD_1")) { autotest::loadtest "tests/_console_shutdown.pm"; } diff --git a/templates.fif.json b/templates.fif.json index 4705099d..b69e83a8 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -874,11 +874,10 @@ "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 12 }, "settings": { - "HDD_1": "%HDD_2%", "IMAGE_DEPLOY": "1", "INSTALL_NO_USER": "1", - "NUMDISKS": "1", - "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2" + "NUMDISKS": "2", + "STORE_HDD_2": "disk_%FLAVOR%_%MACHINE%.qcow2" } }, "install_asian_language": {