From d2c570acd28eaee762a65ab2e190f414d2e81595 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Fri, 5 Jul 2024 12:06:01 +0200 Subject: [PATCH] Minor adjustments to rpmbuild tests for RHEL 10 * Disable librsvg2 in rhel 10 due to false positives * Increase duration for stratisd as it times out in some archs * Add extra logging with system resources at the script setup phase --- tests/Sanity/rpm-rebuild/librsvg2.fmf | 5 +++++ tests/Sanity/rpm-rebuild/runtest.sh | 6 ++++++ tests/Sanity/rpm-rebuild/stratisd.fmf | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/Sanity/rpm-rebuild/librsvg2.fmf b/tests/Sanity/rpm-rebuild/librsvg2.fmf index 52b81b5..7921278 100644 --- a/tests/Sanity/rpm-rebuild/librsvg2.fmf +++ b/tests/Sanity/rpm-rebuild/librsvg2.fmf @@ -16,3 +16,8 @@ adjust+: - enabled: false when: distro < rhel-8 continue: false + + # librsvg2 is flaky in rhel 10 as well + - enabled: false + when: distro == rhel-10 + continue: false diff --git a/tests/Sanity/rpm-rebuild/runtest.sh b/tests/Sanity/rpm-rebuild/runtest.sh index 475d2f9..93588d5 100755 --- a/tests/Sanity/rpm-rebuild/runtest.sh +++ b/tests/Sanity/rpm-rebuild/runtest.sh @@ -15,6 +15,12 @@ rlJournalStart rlDie "The package must be passed over PKG_TO_BUILD environment variable." fi + # Log basic system resources. If we start seeing failures due to disk + # out of space, timeouts, or OOMs this will help identifying where + # the issue might be. + rlRun "free -h" 0 "Available memory" + rlRun 'echo "Processing units: $(nproc)"' 0 "Show processing units" + rlRun "df -h" 0 "Storage space" rlPhaseEnd rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps diff --git a/tests/Sanity/rpm-rebuild/stratisd.fmf b/tests/Sanity/rpm-rebuild/stratisd.fmf index 99189b3..b3698fe 100644 --- a/tests/Sanity/rpm-rebuild/stratisd.fmf +++ b/tests/Sanity/rpm-rebuild/stratisd.fmf @@ -3,7 +3,7 @@ require+: - stratisd environment+: PKG_TO_BUILD: "stratisd" -duration: 1h +duration: 2h tier: 1 tag: