.rteval.metadata

@@ -1 +0,0 @@
-fe85dce7852985e9ca916877b278feed31508f8f SOURCES/rteval-3.7.tar.xz

SOURCES/Revert-rteval-Change-the-default-kernel.patch

@@ -1,9 +1,12 @@
-From c0ee73f00f6868e0ead5ace958a88a6a23db6ad3 Mon Sep 17 00:00:00 2001
+From 47fc74501aa5741fd5dcb2d04aacd857d3d87740 Mon Sep 17 00:00:00 2001
 From: John Kacur <jkacur@redhat.com>
-Date: Thu, 9 Nov 2023 15:43:53 -0500
+Date: Wed, 25 Oct 2023 10:59:28 -0400
-Subject: [PATCH] rteval: Change the default kernel for kcompile to linux-6.6.1
+Subject: [PATCH] Revert "rteval: Change the default kernel to compile to
+ linux-6.1.8"
 
-Change the default kernel for kcompile to linux-6.6.1
+This reverts commit 0f39c69610985b07ce2aa41142d2f0481da8e3a4.
+
+For RHEL-8.x we want to continue using the same kernel for kcompile
 
 Signed-off-by: John Kacur <jkacur@redhat.com>
 ---
@@ -13,7 +16,7 @@ Signed-off-by: John Kacur <jkacur@redhat.com>
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index b73e8c13f3e5..14f74e087eff 100644
+index b73e8c13f3e5..176435a8cfd5 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,7 +18,7 @@ PREFIX  :=      /usr
@@ -21,12 +24,12 @@ index b73e8c13f3e5..14f74e087eff 100644
  LOADDIR	:=	loadsource
  
 -KLOAD	:=	$(LOADDIR)/linux-6.1.8.tar.xz
-+KLOAD	:=	$(LOADDIR)/linux-6.6.1.tar.xz
++KLOAD	:=	$(LOADDIR)/linux-5.18.1.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 8be79ce630d5..0d025771e90e 100644
+index 8be79ce630d5..e531b60754e9 100644
 --- a/rteval/modules/loads/kcompile.py
 +++ b/rteval/modules/loads/kcompile.py
 @@ -20,7 +20,7 @@ expand_cpulist = CpuList.expand_cpulist
@@ -34,7 +37,7 @@ index 8be79ce630d5..0d025771e90e 100644
  nonisolated_cpulist = CpuList.nonisolated_cpulist
  
 -DEFAULT_KERNEL_PREFIX = "linux-6.1"
-+DEFAULT_KERNEL_PREFIX = "linux-6.6"
++DEFAULT_KERNEL_PREFIX = "linux-5.18"
  
  class KBuildJob:
      '''Class to manage a build job bound to a particular node'''
@@ -43,12 +46,12 @@ index 8be79ce630d5..0d025771e90e 100644
  def ModuleParameters():
      return {"source":   {"descr": "Source tar ball",
 -                         "default": "linux-6.1.8.tar.xz",
-+                         "default": "linux-6.6.1.tar.xz",
++                         "default": "linux-5.18.1.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 79e28032dc6b..a4aad33e264f 100644
+index 79e28032dc6b..1a8d0afd2642 100644
 --- a/rteval/rteval.conf
 +++ b/rteval/rteval.conf
 @@ -18,7 +18,7 @@ dbench:    external
@@ -56,7 +59,7 @@ index 79e28032dc6b..a4aad33e264f 100644
  
  [kcompile]
 -source: linux-6.1.8.xz
-+source: linux-6.6.1.xz
++source: linux-5.18.1.xz
  jobspercore: 2
  
  [hackbench]

SOURCES/rteval-Convert-CpuList-class-to-a-module.patch

@@ -272,7 +272,7 @@ index 0d02577..b606f7a 100644
 +compress_cpulist = cpulist_utils.compress_cpulist
 +nonisolated_cpulist = cpulist_utils.nonisolated_cpulist
  
- DEFAULT_KERNEL_PREFIX = "linux-6.6"
+ DEFAULT_KERNEL_PREFIX = "linux-5.18"
  
 @@ -38,7 +39,7 @@ class KBuildJob:
              os.mkdir(self.objdir)

SOURCES/rteval-Disable-use-of-python-dmidecode.patch

@@ -1,87 +0,0 @@
-From d142f0d23d8df1cede3573c3d6cfbf16535b3475 Mon Sep 17 00:00:00 2001
-From: John Kacur <jkacur@redhat.com>
-Date: Wed, 20 Dec 2023 17:55:21 -0500
-Subject: [PATCH 2/2] rteval: Disable use of python-dmidecode
-
-python-dmidecode is not being maintained upstream.
-For now just disable it's use in rteval since it is useful but not
-essential information for running rteval
-
-In the future look at generating this info directly using dmidecode.
-
-Signed-off-by: John Kacur <jkacur@redhat.com>
----
- README                | 6 ------
- doc/installing.txt    | 9 ---------
- rteval/sysinfo/dmi.py | 4 ++--
- 3 files changed, 2 insertions(+), 17 deletions(-)
-
-diff --git a/README b/README
-index a5cf98344a46..b352d7f66ad2 100644
---- a/README
-+++ b/README
-@@ -19,15 +19,9 @@ Rteval requires the following packages to run:
- Python >= 3.0
-     http://www.python.org/download/
- 
--python-ethtool
--    git://git.kernel.org/pub/scm/linux/kernel/git/acme/python-ethtool.git
--
- python-lxml
-   http://lxml.de/
- 
--python-dmidecode
--    http://www.ohloh.net/p/python-dmidecode
--
- libxml2-python
-     http://xmlsoft.org/
- 
-diff --git a/doc/installing.txt b/doc/installing.txt
-index ff2d43cb9481..227249bbc9ed 100644
---- a/doc/installing.txt
-+++ b/doc/installing.txt
-@@ -1,18 +1,10 @@
- The rteval utility requires some external software libraries to run
- properly. These are:
- 
--python-ethtool
--  A python library to query network interfaces
--  git://git.kernel.org/pub/scm/linux/kernel/git/acme/python-ethtool.git
--
- python-lxml
-   A python library to parse XML files and XSLT stylesheets
-   http://lxml.de/
- 
--python-dmidecode
--  A python library used to access DMI table information
--  http://www.autonomy.net.au/display/pydmi/Home
--
- libxml2-python
-   A python library to parse XML files
-   http://xmlsoft.org/
-@@ -22,7 +14,6 @@ rt-tests
-   git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
- 
- 
--$ sudo yum install python-{dmidecode,ethtool)
- $ git clone \
-   git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
- $ cd rt-tests && sudo make prefix=/usr install
-diff --git a/rteval/sysinfo/dmi.py b/rteval/sysinfo/dmi.py
-index e8285d263fe6..c01a0eef1435 100644
---- a/rteval/sysinfo/dmi.py
-+++ b/rteval/sysinfo/dmi.py
-@@ -15,8 +15,8 @@ from rteval import xmlout
- from rteval import rtevalConfig
- 
- try:
--    import dmidecode
--    dmidecode_avail = True
-+    # import dmidecode
-+    dmidecode_avail = False
- except ModuleNotFoundError:
-     dmidecode_avail = False
- 
--- 
-2.42.0
-

SOURCES/rteval-Makefile-More-rpm-cleanups.patch

@@ -1,64 +0,0 @@
-From 2d2e85c459d240926c99b1961bbef090aa80a1fc Mon Sep 17 00:00:00 2001
-From: John Kacur <jkacur@redhat.com>
-Date: Wed, 20 Dec 2023 17:22:22 -0500
-Subject: [PATCH 1/2] rteval: Makefile: More rpm cleanups
-
-Afer having removed the upstream specfile, there were still a few
-references to rpms in the Makefile. These are not necessary because any
-work with rpms can be done with modern rpm tools and are typically done
-by distributions
-
-Also test whether directory 'run' exists since it may have been removed
-by make realclean, and create it if it does not
-
-Signed-off-by: John Kacur <jkacur@redhat.com>
----
- Makefile | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ee4cca555b95..b8bed643f760 100644
---- a/Makefile
-+++ b/Makefile
-@@ -31,6 +31,7 @@ load:
- 	$(PYTHON) rteval-cmd --onlyload -D -L -v --workdir=./run --loaddir=$(HERE)/loadsource -f $(HERE)/rteval/rteval.conf -i $(HERE)/rteval
- 
- sysreport:
-+	[ -d $(HERE)/run ] || mkdir run
- 	$(PYTHON) rteval-cmd -D -v --workdir=$(HERE)/run --loaddir=$(HERE)/loadsource --duration=$(D) -i $(HERE)/rteval --sysreport
- 
- clean:
-@@ -39,7 +40,7 @@ clean:
- 
- realclean: clean
- 	[ -f $(XMLRPCDIR)/Makefile ] && make -C $(XMLRPCDIR) maintainer-clean || echo -n
--	rm -rf run rpm
-+	rm -rf run
- 
- install: install_loads install_rteval
- 
-@@ -73,13 +74,6 @@ rteval-xmlrpc-$(XMLRPCVER).tar.gz :
- 	make distcheck
- 	cp $(XMLRPCDIR)/rteval-xmlrpc-$(XMLRPCVER).tar.gz $(HERE)/
- 
--rpm_prep:
--	rm -rf rpm
--	mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS}
--
--rpms rpm: rpm_prep rtevalrpm loadrpm
--
--
- help:
- 	@echo ""
- 	@echo "rteval Makefile targets:"
-@@ -88,6 +82,7 @@ help:
- 	@echo "        tarfile:   create the source tarball"
- 	@echo "        install:   install rteval locally"
- 	@echo "        clean:     cleanup generated files"
-+	@echo "        realclean: Same as clean plus directory run"
- 	@echo "        sysreport: do a short testrun and generate sysreport data"
- 	@echo "        tags:      generate a ctags file"
- 	@echo "        cleantags: remove the ctags file"
--- 
-2.42.0
-

SPECS/rteval.spec

@@ -1,43 +1,45 @@
 Name:		rteval
 Version:	3.7
-Release:	7%{?dist}
+Release:	4%{?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/%{name}/%{name}-%{version}.tar.xz
+Source0:	https://www.kernel.org/pub/linux/utils/rteval/rteval-%{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:	realtime-tests >= 2.5-1
+Requires:	rt-tests >= 1.5-11
 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:	perl-interpreter perl-devel perl-generators
-Requires:	libmpc, libmpc-devel
+Requires:	libmpc libmpc-devel
-Requires:	dwarves
+Obsoletes:	rteval-common <= 3.1
-BuildArch:	noarch
 
 #Patches
-Patch1: rteval-Change-the-default-kernel-for-kcompile.patch
+Patch1: Revert-rteval-Change-the-default-kernel.patch 
 Patch2: rteval-Remove-upstream-spec-file.patch
-Patch3: rteval-Makefile-More-rpm-cleanups.patch
+Patch3: rteval-Refactor-collapse_cpulist-in-systopology.patch
-Patch4: rteval-Disable-use-of-python-dmidecode.patch
+Patch4: rteval-Minor-improvements-to-CpuList-class.patch
-Patch5: rteval-Refactor-collapse_cpulist-in-systopology.patch
+Patch5: rteval-Convert-CpuList-class-to-a-module.patch
-Patch6: rteval-Minor-improvements-to-CpuList-class.patch
+Patch6: rteval-Add-relative-cpulists-for-measurements.patch
-Patch7: rteval-Convert-CpuList-class-to-a-module.patch
+
-Patch8: rteval-Add-relative-cpulists-for-measurements.patch
 
 %description
 The rteval script is a utility for measuring various aspects of
@@ -56,8 +58,7 @@ to the screen.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+
-%patch8 -p1
 
 %build
 %{__python3} setup.py build
@@ -69,197 +70,170 @@ to the screen.
 %defattr(-,root,root,-)
 %{python3_sitelib}/*.egg-info
 
-%doc README doc/rteval.txt
+%doc COPYING README doc/rteval.txt
-%license COPYING
 %dir %{_datadir}/%{name}
-%{python3_sitelib}/rteval
+%{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/cpulist_utils.py*
 %{_mandir}/man8/rteval.8.gz
 %config(noreplace) %{_sysconfdir}/rteval.conf
 %{_datadir}/%{name}/rteval_*.xsl
-%{_bindir}/rteval
+%{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__/*
 
 %changelog
-* Wed Jan 31 2024 Tomas Glozar <tglozar@redhat.com> - 3.7-7
+* Wed Jan 31 2024 Tomas Glozar <tglozar@redhat.com> - 3.7-4
 - Added patchset for relative cpuset functionality from upstream
-Resolves: RHEL-9912
+Resolves: RHEL-21926
 
-* Thu Dec 21 2023 John Kacur <jkacur@redhat.com> - 3.7-6
+* Wed Nov 15 2023 John Kacur <jkacur@redhat.com> - 3.7-3
-- Disable the use of python-dmidecode
+- Add an rpminspect file to pass gating which is failing due to
-Resolves: RHEL-8857
+  python egg-info directory permissions
+Resolves: RHEL-16401
 
-* Wed Nov 15 2023 John Kacur <jkacur@redhat.com> - 3.7-5
+* Mon Nov 13 2023 John Kacur <jkacur@redhat.com> - 3.7-2
-- Add a capabilities rule to the rpminspect.yaml file
+- Remove upstream spec files
-Resolves: RHEL-16400
+Resolves: RHEL-9189
 
-* Tue Nov 14 2023 John Kacur <jkacur@redhat.com> - 3.7-4
+* Wed Oct 25 2023 John Kacur <jkacur@redhat.com> - 3.7-1
-- Add an rpminspect.yaml file to turn off permissions checks
+- Rebase to upstream rteval-3.7
-  for python egg-info files
+- Revert the change to use a newer default kernel
-Resolves: RHEL-16400
+Resolves: RHEL-8967
 
-* Mon Nov 13 2023 John Kacur <jkacur@redhat.com> - 3.7-3
+* Thu Oct 05 2023 Tomas Glozar <tglozar@redhat.com> - 3.5-9
-- Remove upstream specfile
-Resolves: RHEL-7615
-
-* Thu Nov 09 2023 John Kacur <jkacur@redhat.com> - 3.7-2
-- Update rteval to use linux-6.6.1 as the default kernel for kcompile
-Resolves: RHEL-14483
-
-* Tue Oct 24 2023 John Kacur <jkacur@redhat.com> - 3.7-1
-- Rebase to rteval-3.7 upstream
-jiraProject == RHEL-7863
-
-* Wed Oct 04 2023 Tomas Glozar <tglozar@redhat.com> - 3.5-11
 - Added patch set that enables rteval to do load calculations and reporting
 correctly on systems with isolated CPUs
-jiraProject== RHEL-8681
+jiraProject== RHEL-8680
 
-* Wed Oct 04 2023 John Kacur <jkacur@redhat.com> - 3.5.10
+* Wed Oct 04 2023 John Kacur <jkacur@redhat.com> - 3.5-8
 - Added patches to use argparse instead of deprecated optparse
-jiraProject == RHEL-9026
+jiraProject == RHEL-9029
 
-* Fri Aug 11 2023 John Kacur <jkacur@redhat.com> - 3.5-9
+* Fri Aug 11 2023 John Kacur <jkacur@redhat.com> - 3.5-7
 - Added patches to use f-strings where possible, no functional change
-jiraProject== RHEL-798
+jiraProject == RHEL-797
 
-* Mon Jun 05 2023 Anubhav Shelat <ashelat@redhat.com> - 3.5-8
+* Thu Jun 08 2023 John Kacur <jkacur@redhat.com> - 3.5-6
-- Added code to check if the proc/net/if_inet6 file exists while 
+- Add tests/tests.yml and tests/scripts/run_tests.sh for gating
-  loading IPv6 addresses in the IPv6Addresses class. 
+Resolves: rhbz#2213609
-Resolves: rhbz#2210103
+jiraProject == RHELPLAN-159326
-jiraProject ==  RHELPLAN-158238
 
-* Mon Feb 06 2023 John Kacur <jkacur@redhat.com> - 3.5-7
+* Wed Jun 07 2023 John Kacur <jkacur@redhat.com> - 3.5-5
-- Remove Requires python3-sphinx, as this is only needed for
+- Added code to check if the /proc/net/if_net6 file exists.
-  compiling documentation, and is causing problems in testing
+Resolves: rhbz#2210106
-Resolves: rhbz#2166355
+jiraProject == RHELPLAN-158239
-jiraProject ==  RHELPLAN-147318
 
-* Fri Feb 03 2023 John Kacur <jkacur@redhat.com> - 3.5-6
+* Wed Feb 08 2023 John Kacur <jkacur@redhat.com> - 3.5-4
-- Change the default kernel to compile as a load to linux-6.1.8
+- Add check to catch python-dmidecode if it fails
-- Update requires
+Resolves: rhbz#2168373
-Resolves: rhbz#2166355
+jiraProject == RHELPLAN-148048
-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#2136924
+Resolves: rhbz#2136926
 
 * 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#2062388
+Resolves: rhbz#2131377
 
-* Mon Sep 26 2022 John Kacur <jkacur@redhat.com> - 3.5-1
+* Fri Sep 23 2022 John Kacur <jkacur@redhat.com> - 3.5-1
 - Rebase to rteval-3.5 upstream
-Resolves: rhbz#2119171
+Resolves: rhbz#2119172
 
-* Mon Sep 26 2022 Leah Leshchinsky <lleshchi@redhat.com> - 3.4-4
+* Thu Sep 22 2022 Leah Leshchinsky <lleshchi@redhat.com> - 3.4-5
-- Add measurement and load location information to the run summary report
+- Add measurement and load location to run report
-Resolves: rhbz#2081325
+Resolves: rhbz#2082260
 
-* Tue Sep 13 2022 John Kacur <jkacur@rredhat.com> - 3.4-3
+* Tue Sep 13 2022 John Kacur <jkacur@redhat.com> - 3.4-4
 - Make use of systopology instead of misc everywhere
 - Allow user to enter compressed form of cpulist
-Resolves: rhbz#2121534
+Resolves: rhbz#2121535
 
-* Mon Sep 12 2022 John Kacur <jkacur@redhat.com> - 3.4-2
+* Mon Sep 12 2022 John Kacur <jkacur@redhat.com> - 3.4-3
 - Add option for downloading the kernel to compile as a load
 - Add a manpage entry for the kernel download option
-Resolves: rhbz#2107711
+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
 
 * Tue Jun 28 2022 John Kacur <jkacur@redhat.com> - 3.4-1
 - Rebase to rteval-3.4 upstream
-Resolves: rhbz#2069358
+Resolves: rhbz#2069354
 
-* Wed Jun 22 2022 John Kacur <jkacur@redhat.com> - 3.3-7
+* Wed Jun 22 2022 John Kacur <jkacur@redhat.com> - 3.3-9
 - Add upstream kcompile patches
-Resolves: rhbz#2093480
+Resolves: rhbz#2093478
 
-* Tue Jun 07 2022 John Kacur <jkacur@redhat.com> - 3.3-6
+* Tue Jun 07 2022 John Kacur <jkacur@redhat.com> - 3.3-8
 - Updates the Requires for rteval-loads with the correct kernel version
-Resolves: rhbz#2093480
+Resolves: rhbz#2093478
 
-* Tue Jun 07 2022 John Kacur <jkacur@redhat.com> - 3.3-5
+* Tue Jun 07 2022 John Kacur <jkacur@redhat.com> - 3.3-7
 - Change the default kernel to compile to linux-5.18.1
-Resolves: rhbz#2093480
+Resolves: rhbz#2093478
 
-* Thu Apr 14 2022 John Kacur <jkacur@redhat.com> - 3.3-4
+* Tue Feb 15 2022 John Kacur <jkacur@redhat.com> - 3.3-6
-- 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#1983783
+Resolves: rhbz#2012284
 
-* Mon Feb 07 2022 John Kacur <jkacur@redhat.com> - 3.3-2
+* Mon Feb 07 2022 John Kacur <jkacur@redhat.com> - 3.3-5
 - Don't restrict threads to cpumask in environment if user specifies cpumask
-Resolves: rhbz#1983783
+Resolves: rhbz#2012284
 
-* Wed Jan 26 2022 John Kacur <jkacur@redhat.com> - 3.3-1
+* Thu Jan 27 2022 John Kacur <jkacur@redhat.com> - 3.3-4
-- Rebase to upstream rteval-3.3
-- Fix case where the threshold assignment is not properly parsed
 - Increase the default number of buckets from 2000 to 3500
-Resolves: rhbz#2012294
+Resolves: rhbz#2046321
 
-* Fri Jan 14 2022 John Kacur <jkacur@redhat.com> - 3.2-10
+* 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#1995195
+Resolves: rhbz#2012285
 
-* Wed Jan 12 2022 John Kacur <jkacur@redhat.com> - 3.2-9
+* Thu Jan 13 2022 John Kacur <jkacur@redhat.com> - 3.3-1
+- Rebase to upstream rteval-3.3
+Resolves: rhbz#2012291
+
+* Wed Jan 12 2022 John Kacur <jkacur@redhat.com> - 3.2-4
 - 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#1995195
+Resolves: rhbz#2012285
 
-* Thu Nov 04 2021 John Kacur <jkacur@redhat.com> - 3.2-8
+* Thu Nov 04 2021 John Kacur <jkacur@redhat.com> - 3.2-3
 - 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#2007022
+Resolves: rhbz#1872776
-
-* 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 the cpumask
+- Restrict measurement threads to cpus in cpumask
-Resolves: rhbz#1982707
+Resolves: rhbz#1942261
 
-* Fri Jul 09 2021 John Kacur <jkacur@redhat.com> - 3.2-1
+* Thu Jul 15 2021 John Kacur <jkacur@redhat.com> - 3.2-1
 - Rebase to latest upstream rteval-3.2
-- Remove patches that are included in the rebase
+Resolves: rhbz#1982718
-Resolves: rhbz#1890561
 
 * Wed Jan 13 2021 John Kacur <jkacur@redhat.com> - 3.1-4
 - Remove python-schedutils requirement