From b67254effee3d3e1a5a536adebedb1624761f097 Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Mon, 20 May 2024 13:13:47 +0200 Subject: [PATCH] Fix and enable multilib tests (gh#641) Skip package that has conflicting architectures. --- containers/runner/skip-testtypes | 2 -- packages-multilib.ks.in | 1 + packages-multilib.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/containers/runner/skip-testtypes b/containers/runner/skip-testtypes index 09815dc7..c21bc5cf 100644 --- a/containers/runner/skip-testtypes +++ b/containers/runner/skip-testtypes @@ -12,7 +12,6 @@ fedora_skip_array=( skip-on-fedora gh576 # clearpart-4 test is flaky on all scenarios gh595 # proxy-cmdline failing on all scenarios - gh641 # packages-multilib failing on systemd conflict gh680 # proxy-kickstart and proxy-auth failing gh740 # fedora-live-image-build fails on comps changes gh774 # autopart-luks-1 failing @@ -53,7 +52,6 @@ rhel9_skip_array=( gh576 # clearpart-4 test is flaky on all scenarios gh595 # proxy-cmdline failing on all scenarios gh604 # packages-weakdeps: "gnupg2 --recommends has changed, test needs to be updated" - gh641 # packages-multilib failing on systemd conflict gh774 # autopart-luks-1 failing gh804 # tests requiring dvd iso failing ) diff --git a/packages-multilib.ks.in b/packages-multilib.ks.in index 67d19a94..a0fbd283 100644 --- a/packages-multilib.ks.in +++ b/packages-multilib.ks.in @@ -7,6 +7,7 @@ %ksappend common/common_no_payload.ks %packages --multilib +-fwupd %end %post diff --git a/packages-multilib.sh b/packages-multilib.sh index 85cd24be..6187fa64 100755 --- a/packages-multilib.sh +++ b/packages-multilib.sh @@ -19,6 +19,6 @@ # Ignore unused variable parsed out by tooling scripts as test tags metadata # shellcheck disable=SC2034 -TESTTYPE="packaging skip-on-rhel-8 gh641" +TESTTYPE="packaging skip-on-rhel-8" . ${KSTESTDIR}/functions.sh