Compare commits

...

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

3 changed files with 167 additions and 79 deletions

View File

@ -1,4 +1,4 @@
From eacf0f1e55fa0e7217133172808bfef2c59242fb Mon Sep 17 00:00:00 2001
From 606bb31cbf967e5e48c10c7e8ea8bab0685eb410 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Thu, 2 Feb 2023 00:47:31 -0500
Subject: [PATCH] rteval: Catch failures in python-dmidecode
@ -9,7 +9,7 @@ namely Attribute unit redefined
Although useful, the dmidecode is not critical to rteval reporting.
Therefore catch this, and first see if we can at least query the bios.
If that works report the bios instead of all, and if that
If that works report the bios instead off all, and if that
doesn't work, just continue without the dmidecode report.
Signed-off-by: John Kacur <jkacur@redhat.com>

View File

@ -0,0 +1,67 @@
From 0f39c69610985b07ce2aa41142d2f0481da8e3a4 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Fri, 3 Feb 2023 16:13:09 -0500
Subject: [PATCH 8/8] rteval: Change the default kernel to compile to
linux-6.1.8
rteval compiles the linux kernel as a load
Change the default kernel that rteval compiles to linux-6.1.8
Signed-off-by: John Kacur <jkacur@redhat.com>
---
Makefile | 2 +-
rteval/modules/loads/kcompile.py | 4 ++--
rteval/rteval.conf | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index ffea8a05f460..81ca8242bbbe 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ PREFIX := /usr
DATADIR := $(DESTDIR)/$(PREFIX)/share
LOADDIR := loadsource
-KLOAD := $(LOADDIR)/linux-5.18.1.tar.xz
+KLOAD := $(LOADDIR)/linux-6.1.8.tar.xz
BLOAD := $(LOADDIR)/dbench-4.0.tar.gz
LOADS := $(KLOAD) $(BLOAD)
diff --git a/rteval/modules/loads/kcompile.py b/rteval/modules/loads/kcompile.py
index 6faa686f81d0..35ee5cbbb52d 100644
--- a/rteval/modules/loads/kcompile.py
+++ b/rteval/modules/loads/kcompile.py
@@ -38,7 +38,7 @@ from rteval.systopology import CpuList, SysTopology
expand_cpulist = CpuList.expand_cpulist
compress_cpulist = CpuList.compress_cpulist
-DEFAULT_KERNEL_PREFIX = "linux-5.18"
+DEFAULT_KERNEL_PREFIX = "linux-6.1"
class KBuildJob:
'''Class to manage a build job bound to a particular node'''
@@ -349,7 +349,7 @@ class Kcompile(CommandLineLoad):
def ModuleParameters():
return {"source": {"descr": "Source tar ball",
- "default": "linux-5.18.1.tar.xz",
+ "default": "linux-6.1.8.tar.xz",
"metavar": "TARBALL"},
"jobspercore": {"descr": "Number of working threads per core",
"default": 2,
diff --git a/rteval/rteval.conf b/rteval/rteval.conf
index 1a8d0afd2642..79e28032dc6b 100644
--- a/rteval/rteval.conf
+++ b/rteval/rteval.conf
@@ -18,7 +18,7 @@ dbench: external
stressng: module
[kcompile]
-source: linux-5.18.1.xz
+source: linux-6.1.8.xz
jobspercore: 2
[hackbench]
--
2.39.0

View File

@ -1,42 +1,41 @@
Name: rteval
Version: 3.5
Release: 4%{?dist}
Release: 7%{?dist}
Summary: Utility to evaluate system suitability for RT Linux
Group: Development/Tools
License: GPLv2
URL: https://git.kernel.org/pub/scm/utils/rteval/rteval.git
Source0: https://www.kernel.org/pub/linux/utils/rteval/rteval-%{version}.tar.xz
Source0: https://www.kernel.org/pub/linux/utils/%{name}/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python3-devel
Requires: platform-python
Requires: python3-lxml
Requires: python3-libxml2
Requires: python3-dmidecode >= 3.10
Requires: python3-requests
Requires: rt-tests >= 1.5-11
Requires: realtime-tests >= 2.5-1
Requires: rteval-loads >= 1.6-2
Requires: sysstat
Requires: xz bzip2 tar gzip m4 make gawk
Requires: kernel-headers
Requires: sos
BuildArch: noarch
Obsoletes: rteval <= 2.14
Requires: numactl
Requires: gcc binutils gcc-c++ flex bison bc make
Requires: elfutils elfutils-libelf-devel
Requires: openssl openssl-devel
Requires: stress-ng
Requires: perl-interpreter perl-devel perl-generators
Requires: libmpc libmpc-devel
Obsoletes: rteval-common <= 3.1
Requires: perl-interpreter, perl-devel, perl-generators
Requires: libmpc, libmpc-devel
Requires: dwarves
BuildArch: noarch
#Patches
Patch1: rteval-Replace-python-ethtool-with-inline-code.patch
Patch2: Fix-DMI-WARNING-when-not-running-as-root.patch
Patch3: rteval-Don-t-attempt-to-get-DMIinfo-if-there-are-dmi.patch
Patch4: rteval-Catch-failures-in-python-dmidecode.patch
Patch5: rteval-Change-the-default-kernel-to-compile-to-linux.patch
%description
The rteval script is a utility for measuring various aspects of
@ -53,6 +52,7 @@ to the screen.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
%{__python3} setup.py build
@ -64,128 +64,149 @@ to the screen.
%defattr(-,root,root,-)
%{python3_sitelib}/*.egg-info
%doc COPYING README doc/rteval.txt
%doc README doc/rteval.txt
%license COPYING
%dir %{_datadir}/%{name}
%{python3_sitelib}/rteval/rtevalclient.py*
%{python3_sitelib}/rteval/rtevalConfig.py*
%{python3_sitelib}/rteval/rtevalXMLRPC.py*
%{python3_sitelib}/rteval/version.py*
%{python3_sitelib}/rteval/Log.py*
%{python3_sitelib}/rteval/systopology.py*
%{python3_sitelib}/rteval
%{_mandir}/man8/rteval.8.gz
%config(noreplace) %{_sysconfdir}/rteval.conf
%{_datadir}/%{name}/rteval_*.xsl
%{python3_sitelib}/rteval/__init__.py*
%{python3_sitelib}/rteval/rtevalMailer.py*
%{python3_sitelib}/rteval/rtevalReport.py*
%{python3_sitelib}/rteval/xmlout.py*
%{python3_sitelib}/rteval/modules
%{python3_sitelib}/rteval/sysinfo
/usr/bin/rteval
%{python3_sitelib}/rteval/__pycache__/*
%{_bindir}/rteval
%changelog
* Wed Feb 08 2023 John Kacur <jkacur@redhat.com> - 3.5-4
- Add check to catch python-dmidecode if it fails
Resolves: rhbz#2168373
jiraProject == RHELPLAN-148048
* Mon Feb 06 2023 John Kacur <jkacur@redhat.com> - 3.5-7
- Remove Requires python3-sphinx, as this is only needed for
compiling documentation, and is causing problems in testing
Resolves: rhbz#2166355
jiraProject == RHELPLAN-147318
* Fri Feb 03 2023 John Kacur <jkacur@redhat.com> - 3.5-6
- Change the default kernel to compile as a load to linux-6.1.8
- Update requires
Resolves: rhbz#2166355
jiraProject == RHELPLAN-147318
* Thu Feb 02 2023 John Kacur <jkacur@redhat.com> - 3.5-5
- Change requires to python-sphinx
Resolves: rhbz#2164416
* Thu Feb 02 2023 John Kacur <jkacur@redhat.com> - 3.5-4
- Catch failures in python-dmidecode
Resolves: rhbz#2164416
* Thu Oct 27 2022 John Kacur <jkacur@redhat.com> - 3.5-3
- Fix "DMI WARNING" when not running as root
- Don't attempt to get DMI info if dmidecode returns warnings
Resolves: rhbz#2136926
Resolves: rhbz#2136924
* Mon Oct 17 2022 John Kacur <jkacur@redhat.com> - 3.5-2
- Remove dependency on python-ethtool by using inline code
- Add Requires of python-libxml2
Resolves: rhbz#2131377
Resolves: rhbz#2062388
* Fri Sep 23 2022 John Kacur <jkacur@redhat.com> - 3.5-1
* Mon Sep 26 2022 John Kacur <jkacur@redhat.com> - 3.5-1
- Rebase to rteval-3.5 upstream
Resolves: rhbz#2119172
Resolves: rhbz#2119171
* Thu Sep 22 2022 Leah Leshchinsky <lleshchi@redhat.com> - 3.4-5
- Add measurement and load location to run report
Resolves: rhbz#2082260
* Mon Sep 26 2022 Leah Leshchinsky <lleshchi@redhat.com> - 3.4-4
- Add measurement and load location information to the run summary report
Resolves: rhbz#2081325
* Tue Sep 13 2022 John Kacur <jkacur@redhat.com> - 3.4-4
* Tue Sep 13 2022 John Kacur <jkacur@rredhat.com> - 3.4-3
- Make use of systopology instead of misc everywhere
- Allow user to enter compressed form of cpulist
Resolves: rhbz#2121535
Resolves: rhbz#2121534
* Mon Sep 12 2022 John Kacur <jkacur@redhat.com> - 3.4-3
* Mon Sep 12 2022 John Kacur <jkacur@redhat.com> - 3.4-2
- Add option for downloading the kernel to compile as a load
- Add a manpage entry for the kernel download option
Resolves: rhbz#2107710
* Tue Jun 28 2022 John Kacur <jkacur@redhat.com> - 3.4-2
- Add back __pycache__ to the rhel-8.7 spec file
Resolves: rhbz#2069354
Resolves: rhbz#2107711
* Tue Jun 28 2022 John Kacur <jkacur@redhat.com> - 3.4-1
- Rebase to rteval-3.4 upstream
Resolves: rhbz#2069354
Resolves: rhbz#2069358
* Wed Jun 22 2022 John Kacur <jkacur@redhat.com> - 3.3-9
* Wed Jun 22 2022 John Kacur <jkacur@redhat.com> - 3.3-7
- Add upstream kcompile patches
Resolves: rhbz#2093478
Resolves: rhbz#2093480
* Tue Jun 07 2022 John Kacur <jkacur@redhat.com> - 3.3-8
* Tue Jun 07 2022 John Kacur <jkacur@redhat.com> - 3.3-6
- Updates the Requires for rteval-loads with the correct kernel version
Resolves: rhbz#2093478
Resolves: rhbz#2093480
* Tue Jun 07 2022 John Kacur <jkacur@redhat.com> - 3.3-7
* Tue Jun 07 2022 John Kacur <jkacur@redhat.com> - 3.3-5
- Change the default kernel to compile to linux-5.18.1
Resolves: rhbz#2093478
Resolves: rhbz#2093480
* Tue Feb 15 2022 John Kacur <jkacur@redhat.com> - 3.3-6
* Thu Apr 14 2022 John Kacur <jkacur@redhat.com> - 3.3-4
- Fix Popen for python3.6
- Fix allmodconfig when SHA1 signing of modules is not available
Resolves: rhbz#2062829
* Tue Feb 15 2022 John Kacur <jkacur@redhat.com> - 3.3-3
- Use inherited cpumask if user doesn't specify a cpumask
Resolves: rhbz#2012284
Resolves: rhbz#1983783
* Mon Feb 07 2022 John Kacur <jkacur@redhat.com> - 3.3-5
* Mon Feb 07 2022 John Kacur <jkacur@redhat.com> - 3.3-2
- Don't restrict threads to cpumask in environment if user specifies cpumask
Resolves: rhbz#2012284
Resolves: rhbz#1983783
* Thu Jan 27 2022 John Kacur <jkacur@redhat.com> - 3.3-4
- Increase the default number of buckets from 2000 to 3500
Resolves: rhbz#2046321
* Tue Jan 18 2022 John Kacur <jkacur@redhat.com> - 3.3-3
- Fix Popen use of text=True not available in python3.6
Resolves: rhbz#2041584
* Fri Jan 14 2022 John Kacur <jkacur@redhat.com> - 3.3-2
- Fix test missing threshold assignment
Resolves: rhbz#2012285
* Thu Jan 13 2022 John Kacur <jkacur@redhat.com> - 3.3-1
* Wed Jan 26 2022 John Kacur <jkacur@redhat.com> - 3.3-1
- Rebase to upstream rteval-3.3
Resolves: rhbz#2012291
- Fix case where the threshold assignment is not properly parsed
- Increase the default number of buckets from 2000 to 3500
Resolves: rhbz#2012294
* Wed Jan 12 2022 John Kacur <jkacur@redhat.com> - 3.2-4
* Fri Jan 14 2022 John Kacur <jkacur@redhat.com> - 3.2-10
- Fix test missing threshold assignment
Resolves: rhbz#1995195
* Wed Jan 12 2022 John Kacur <jkacur@redhat.com> - 3.2-9
- Do not pass obsolete notrace option to cyclictest
- Parse maximum latency even if outside configured buckets
- Sort the list of cpus
- Skip statistics generation if max latency outside of configured buckets
- Add --cyclictest-threshold=USEC feature
- Add libmpc and libmpc-devel to the Requires
Resolves: rhbz#2012285
Resolves: rhbz#1995195
* Thu Nov 04 2021 John Kacur <jkacur@redhat.com> - 3.2-3
* Thu Nov 04 2021 John Kacur <jkacur@redhat.com> - 3.2-8
- allow hackbench to run with warning on low mem
- clean-ups to hackbench.py
- make donotrun work correctly in load modules
- Add the idea of an exclusive load module and make stress-ng one
Resolves: rhbz#1872776
Resolves: rhbz#2007022
* Tue Aug 10 2021 John Kacur <jkacur@redhat.com> - 3.2-7
- Add perl, gcc-c++ and a few other utilities for kernel compilation
- Reorganize the Requires a little for clarity
Resolves: rhbz#1987037
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.2-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jul 16 2021 John Kacur <jkacur@redhat.com> - 3.2-5
- Make changes to use linux-5.13.2 kernel
- specfile changes to undo some inadvertent changes from e083e0224c00d984e9e9e7
Resolves: rhbz#1982810
* Thu Jul 15 2021 John Kacur <jkacur@redhat.com> - 3.2-4
- Fix Requires to require realtime-tests not rt-tests
Resolves: rhbz#1981875
* Thu Jul 15 2021 John Kacur <jkacur@redhat.com> - 3.2-3
- Add stress-ng as a Requires in the specfile
Resolves: rhbz#1981875
* Thu Jul 15 2021 John Kacur <jkacur@redhat.com> - 3.2-2
- Restrict measurement threads to cpus in cpumask
Resolves: rhbz#1942261
- Restrict measurement threads to cpus in the cpumask
Resolves: rhbz#1982707
* Thu Jul 15 2021 John Kacur <jkacur@redhat.com> - 3.2-1
* Fri Jul 09 2021 John Kacur <jkacur@redhat.com> - 3.2-1
- Rebase to latest upstream rteval-3.2
Resolves: rhbz#1982718
- Remove patches that are included in the rebase
Resolves: rhbz#1890561
* Wed Jan 13 2021 John Kacur <jkacur@redhat.com> - 3.1-4
- Remove python-schedutils requirement