From e768b4d3a3e19c5fe66053043f04263b2bfe91e8 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Tue, 28 May 2024 15:16:36 +0200 Subject: [PATCH 1/2] Ugly hack for missing config-manager https://github.com/fedora-ci/mini-tps/issues/57#issuecomment-2134998129 Will be removed with a proper fix for the #57 --- mini-tps.spec | 5 ++++- profiles/fedora/prepare-system | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mini-tps.spec b/mini-tps.spec index 0d8ddad..251304b 100644 --- a/mini-tps.spec +++ b/mini-tps.spec @@ -6,7 +6,7 @@ Name: mini-tps Version: 0.1 -Release: 175%{?dist} +Release: 176%{?dist} Summary: Mini TPS - Test Package Sanity License: GPLv2 @@ -73,6 +73,9 @@ install -pD -m 0755 profiles/fedora/prepare-system %{buildroot}%{_libexecdir}/mi %changelog +* Tue May 28 2024 Jiri Popelka - 0.1-176 +- hack for missing config-manager + * Tue May 21 2024 Jiri Popelka - 0.1-175 - revert a SELinux-related change diff --git a/profiles/fedora/prepare-system b/profiles/fedora/prepare-system index 455fef0..cf03daa 100755 --- a/profiles/fedora/prepare-system +++ b/profiles/fedora/prepare-system @@ -46,6 +46,11 @@ skip_if_unavailable=True EOF fi +# Ugly hack for +# https://github.com/fedora-ci/mini-tps/issues/57#issuecomment-2134998129 +# Remove it with a proper fix for mini-tps/issues/57 ! +dnf-3 -y install 'dnf-command(config-manager)' + # Make sure fedora and fedora-updates repos are enabled "$YUMDNFCMD" config-manager --set-enabled 'fedora' 'updates' # Disable all COPR repositories (mini-tps, ...) From 9f5df156205470016d1b2a04db489610ce958cb6 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Tue, 28 May 2024 15:33:19 +0200 Subject: [PATCH 2/2] Reapply "setenforce fails when running in a container" This reverts commit b8abc0868fb311503e1f6de9605b02c7a33b15ea. --- mtps-run-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mtps-run-tests b/mtps-run-tests index ed35bb7..34a8065 100755 --- a/mtps-run-tests +++ b/mtps-run-tests @@ -138,7 +138,7 @@ if [ -n "$SELINUX" ]; then fi if [ -e '/usr/sbin/setenforce' ]; then echo "Set selinux enforce to: $SELINUX" - setenforce "$SELINUX" + setenforce "$SELINUX" || : # Always return 0 to be able to run/test in a container else debug "Skipping setenforce. 'setenforce' command is part of libselinux-utils package." fi