From b284e792504f33f2e11e212ac30b8eec53b4cc7d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 2 Nov 2020 16:09:03 -0800 Subject: [PATCH] Use PREVREL image not CURRREL for resize_lvm tests (#201) These tests assume the desktop base disk image has an ext4-on-LVM layout, but from F33 onwards it doesn't, it uses btrfs as that's the new distro default. We need a proper fix for this, but for now, just make the test use the F32 disk image. This buys us six months at least. Signed-off-by: Adam Williamson --- templates.fif.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates.fif.json b/templates.fif.json index 6e7add3b..4705099d 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -739,7 +739,7 @@ }, "settings": { "PARTITIONING": "custom_blivet_resize_lvm", - "HDD_1": "disk_f%CURRREL%_desktop_4_%ARCH%.img", + "HDD_1": "disk_f%PREVREL%_desktop_4_%ARCH%.img", "ROOT_PASSWORD": "weakpassword", "INSTALL": "1" } @@ -752,7 +752,7 @@ }, "settings": { "PARTITIONING": "custom_resize_lvm", - "HDD_1": "disk_f%CURRREL%_desktop_4_%ARCH%.img", + "HDD_1": "disk_f%PREVREL%_desktop_4_%ARCH%.img", "INSTALL": "1", "ROOT_PASSWORD": "weakpassword" }