Skip to content

Commit fa95cfd

Browse files
honecgwalters
authored andcommitted
ignore composefs tmt for now since --karg and --karg-delete aren't implemented for composefs
Signed-off-by: Terence Lee <hone02@gmail.com>
1 parent f15b0fe commit fa95cfd

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

tmt/plans/integration.fmf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,5 @@ execute:
238238
how: fmf
239239
test:
240240
- /tmt/tests/tests/test-40-install-karg-delete
241+
extra-fixme_skip_if_composefs: true
241242
# END GENERATED PLANS

tmt/tests/booted/test-install-karg-delete.nu

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# tmt:
33
# summary: Test bootc install --karg-delete
44
# duration: 30m
5+
# extra:
6+
# fixme_skip_if_composefs: true
57
#
68
use std assert
79
use tap.nu
@@ -13,9 +15,6 @@ let target_image = (tap get_target_image)
1315
mkdir /var/mnt
1416
truncate -s 10G disk.img
1517
mkfs.ext4 disk.img
16-
if (tap is_composefs) {
17-
tune2fs -O verity disk.img
18-
}
1918
mount -o loop disk.img /var/mnt
2019

2120
# Mask off the bootupd state to reproduce https://github.com/bootc-dev/bootc/issues/1778
@@ -27,14 +26,8 @@ setenforce 0
2726
mkdir /etc/bootc/install
2827
{ install: { kargs: ["foo=bar"] } } | to toml | save /etc/bootc/install/99-test.toml
2928

30-
let base_args = $"bootc install to-filesystem --disable-selinux --bootloader none --source-imgref ($target_image) --karg-delete localtestkarg --karg-delete foo"
31-
let install_cmd = if (tap is_composefs) {
32-
$"($base_args) --composefs-backend /var/mnt"
33-
} else {
34-
$"($base_args) /var/mnt"
35-
}
29+
tap run_install $"bootc install to-filesystem --disable-selinux --bootloader none --source-imgref ($target_image) --karg-delete localtestkarg --karg-delete foo /var/mnt"
3630

37-
tap run_install $install_cmd
3831

3932
# Verify the karg is gone from the bootloader entries
4033
let entries = (glob /var/mnt/boot/loader/entries/*.conf

0 commit comments

Comments
 (0)