From e2834b00283401e1a1cb8c6a1768b2c2fdaa7836 Mon Sep 17 00:00:00 2001 From: Sergey Kolosov Date: Tue, 24 Feb 2026 09:51:00 +0100 Subject: [PATCH] CI Tests: remove conflicting glibc32 to fix prepare stage RPM-Changelog: - RPM-Skip-Release: yes --- plans/ci.fmf | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 7249575..7749a2d 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -2,14 +2,29 @@ summary: CI Gating Plan discover: how: fmf directory: tests + +prepare: + - name: Workaround for glibc32 conflict + how: shell + order: 10 + script: | + if [[ "$(uname -m)" == "x86_64" ]] && rpm -q glibc32 &>/dev/null; then + echo "Remove glibc32 to avoid conflict with glibc.i686" + dnf remove -y glibc32 + fi + adjust: - when: distro == rhel prepare+: - - how: shell + - name: Enable RHEL CRB + how: shell + order: 20 script: dnf config-manager --set-enabled *-CRB - when: distro == centos prepare+: - - how: shell + - name: Enable CentOS CRB + how: shell + order: 20 script: dnf config-manager --set-enabled crb execute: how: tmt