From db5add9b65877d0372d8a60f749160d55df8498d Mon Sep 17 00:00:00 2001 From: An Long Date: Tue, 31 Dec 2024 14:37:20 +0800 Subject: [PATCH] xfstests: ignore installation dependencies Ignore installation dependencies of xfstests on ppc64le on microos --- tests/xfstests/install.pm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/xfstests/install.pm b/tests/xfstests/install.pm index 794edc27645c..3a82811425ec 100644 --- a/tests/xfstests/install.pm +++ b/tests/xfstests/install.pm @@ -24,6 +24,7 @@ use repo_tools 'add_qa_head_repo'; use version_utils qw(is_sle is_leap is_tumbleweed is_sle_micro is_transactional); use File::Basename; use transactional; +use Utils::Architectures 'is_ppc64le'; my $STATUS_LOG = '/opt/status.log'; my $VERSION_LOG = '/opt/version.log'; @@ -51,7 +52,21 @@ sub install_xfstests_from_repo { script_run('id fsgqa2 &> /dev/null || useradd -d /home/fsgqa2 -k /etc/skel -ms /bin/bash -U fsgqa2'); script_run('getent group sys >/dev/null || groupadd -r sys'); script_run('id daemon &> /dev/null || useradd daemon -g sys'); - trup_call('pkg install xfstests'); + if (is_ppc64le) { + script_run_interactive( + "transactional-update -n pkg install xfstests", + [ + { + prompt => qr/Choose from above solutions by number or cancel/m, + key => '2', + }, + ], + 100 + ); + } + else { + trup_call('pkg install xfstests'); + } unless (is_sle_micro('>=6.0')) { trup_call('--continue pkg install fio'); }