Compare commits

...

No commits in common. "c8s" and "c9" have entirely different histories.
c8s ... c9

8 changed files with 17 additions and 66 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/rig-1.1.tar.gz
/rig-1.1.tar.gz

1
.rig.metadata Normal file
View File

@ -0,0 +1 @@
5d4696794a5f5ff18d05a8595bbc53562b5f372a SOURCES/rig-1.1.tar.gz

View File

@ -1,15 +1,12 @@
Name: rig
Summary: Monitor a system for events and trigger specific actions
Version: 1.1
Release: 4%{?dist}
Release: 6%{?dist}
Url: https://github.com/TurboTurtle/rig
Source0: %{url}/archive/%{name}-%{version}.tar.gz
License: GPLv2
BuildArch: noarch
Requires: python3dist(systemd-python)
Requires: python3dist(psutil)
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3dist(systemd-python)
@ -17,7 +14,6 @@ BuildRequires: python3dist(psutil)
Patch1: rig-fix-rig-list.patch
Patch2: rig-full-random-temp.patch
Patch3: sos-modify-sosreport-binary.patch
%description
Rig is a utility designed to watch or monitor specific system resources (e.g.
@ -29,7 +25,6 @@ troubleshooting and data collection for randomly occurring events.
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%py3_build
@ -50,22 +45,25 @@ install -p -m644 man/en/rig.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
%doc README.md
%changelog
* Wed Aug 06 2025 Jose Castillo <jcastill@redhat.com> - 1.1-4
- Add fix to avoid using deprecated sosreport command.
* Mon Jun 13 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-3
* Tue Jun 14 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-6
- Backport change to temp dir creation to ignore rig ID
* Tue May 31 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-2
- Backport fix of rig list race condition
* Thu Jun 02 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-4
- Backport fix for rig list race condition
* Fri Apr 22 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-1
* Fri May 04 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-2
- Rebase to version 1.1
Related: RHBZ#2064752
Related: RHBZ#2077096
* Mon Oct 04 2021 Jake Hunsaker <jhunsake@redhat.com> - 1.0-3
- Rebuilt for RHEL 8.6.0
- RHBZ#1888705
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Jake Hunsaker <jhunsake@redhat.com> - 1.0-1
- Version 1.0 release
- Version 1.0 release

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

View File

@ -1,39 +0,0 @@
From 57c2d62fd86522714e3eacc3fcd76ff8ad780e0b Mon Sep 17 00:00:00 2001
From: Jose Castillo <jcastillo@redhat.com>
Date: Thu, 7 Aug 2025 09:04:25 +0100
Subject: [PATCH] [sos] Modify sosreport binary
The 'sosreport' command has been deprecated in
sos upstream, and users should use now 'sos report' instead.
This commit prevents an error that occurs
when calling the old sos binary.
Signed-off-by: Jose Castillo <jcastillo@redhat.com>
---
rig-c9s/rig-rig-1.1/rigging/actions/sosreport.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rigging/actions/sosreport.py b/rigging/actions/sosreport.py
index 5f7435a..abf6471 100644
--- a/rigging/actions/sosreport.py
+++ b/rigging/actions/sosreport.py
@@ -14,7 +14,7 @@ from pipes import quote
from rigging.actions import BaseAction
from rigging.exceptions import CannotConfigureRigError
-SOS_BIN = '/usr/sbin/sosreport --batch'
+SOS_BIN = '/usr/sbin/sos report --batch'
class SoSReport(BaseAction):
@@ -23,7 +23,7 @@ class SoSReport(BaseAction):
enabling_opt = 'sosreport'
enabling_opt_desc = 'Generate an sos report when triggered'
priority = 100
- required_binaries = ('sosreport',)
+ required_binaries = ('sos',)
sos_opts = ('only_plugins', 'skip_plugins', 'enable_plugins',
'plugin_option')
--
2.50.1

View File

@ -1 +0,0 @@
SHA512 (rig-1.1.tar.gz) = d62a46370f55cb700a47ad22b332586cf6b33f0e7b2145847b5a57cc0eb6d4368b6f356fcf97085471251f265596031a51664bad60d6666b959965c412fb20ce