From 5032b59f72d972e3ece67c163f2ed15bb301e1ef Mon Sep 17 00:00:00 2001 From: Jiri Konecny Date: Wed, 4 Sep 2024 10:54:53 +0200 Subject: [PATCH 1/2] Revert "Disable rpm-ostree-container-luks for gh1250" Fixed by https://gitlab.com/fedora/bootc/base-images/-/issues/17 This reverts commit 18f956a8412f7c36b778c605bc6a2e8f6e508a70. --- containers/runner/skip-testtypes | 1 - rpm-ostree-container-luks.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/containers/runner/skip-testtypes b/containers/runner/skip-testtypes index cfb44dbe..319a834d 100644 --- a/containers/runner/skip-testtypes +++ b/containers/runner/skip-testtypes @@ -22,7 +22,6 @@ fedora_skip_array=( gh1023 # rpm-ostree failing gh1060 # vnc tests too flaky gh1237 # container failing - gh1250 # rpm-ostree-container-luks fails to boot ) daily_iso_skip_array=( diff --git a/rpm-ostree-container-luks.sh b/rpm-ostree-container-luks.sh index 1351a29d..4888c24c 100755 --- a/rpm-ostree-container-luks.sh +++ b/rpm-ostree-container-luks.sh @@ -18,12 +18,12 @@ # Ignore unused variable parsed out by tooling scripts as test tags metadata # shellcheck disable=SC2034 -TESTTYPE="payload ostree bootc luks reboot skip-on-rhel-8 gh1250 gh1293" +TESTTYPE="payload ostree bootc luks reboot skip-on-rhel-8 gh1293" . ${KSTESTDIR}/functions.sh copy_interesting_files_from_system() { - local disksdir args luks_partition root_lv + local disksdir args luks_partition root_lv disksdir="${1}" # Find disks. From 2530e33e6a41fca7f235ab30fd8ec8cb1f16c15b Mon Sep 17 00:00:00 2001 From: Jiri Konecny Date: Wed, 4 Sep 2024 11:10:31 +0200 Subject: [PATCH 2/2] Revert "Disable rpm-ostree-container-luks on rhel10 until gh1293 is fixed" Fixed by https://gitlab.com/fedora/bootc/base-images/-/issues/17 This reverts commit 7fb8e6246209c1182363ad7598695287ea633252. --- containers/runner/skip-testtypes | 1 - rpm-ostree-container-luks.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/containers/runner/skip-testtypes b/containers/runner/skip-testtypes index 319a834d..43fd0de4 100644 --- a/containers/runner/skip-testtypes +++ b/containers/runner/skip-testtypes @@ -69,7 +69,6 @@ rhel10_skip_array=( gh1207 # packages-multilib failing gh1213 # harddrive-iso-single failing gh1270 # selinux-contexts failing - gh1293 # rpm-ostree-container-luks failing ) # used in workflows/daily-boot-iso-rhel8.yml diff --git a/rpm-ostree-container-luks.sh b/rpm-ostree-container-luks.sh index 4888c24c..7995f42c 100755 --- a/rpm-ostree-container-luks.sh +++ b/rpm-ostree-container-luks.sh @@ -18,7 +18,7 @@ # Ignore unused variable parsed out by tooling scripts as test tags metadata # shellcheck disable=SC2034 -TESTTYPE="payload ostree bootc luks reboot skip-on-rhel-8 gh1293" +TESTTYPE="payload ostree bootc luks reboot skip-on-rhel-8" . ${KSTESTDIR}/functions.sh