From 980f4de6c528615e9925d42d1b29ea9717f4d227 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 23 Aug 2023 12:30:00 -0400 Subject: [PATCH] Fix tests When running tests, install 8.0 packages, not 7.0 packages. For rpminspect, also exclude the second copy of libcoreclr.so from the badfuncs check. Related: RHBZ#2224124 --- rpminspect.yaml | 2 ++ tests/ci.fmf | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rpminspect.yaml b/rpminspect.yaml index 71b90ce..9293249 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -11,6 +11,8 @@ badfuncs: # libSystem*so. /usr/lib64/dotnet/shared/Microsoft.NETCore.App/*/libcoreclr.so: - inet_addr + /usr/lib64/dotnet/packs/Microsoft.NETCore.App.Runtime.*/*/runtimes/*/native/libcoreclr.so: + - inet_addr runpath: # Upstream explicitly sets $ORIGIN/netcoredeps as an RPATH # See https://github.com/dotnet/core/blob/main/Documentation/self-contained-linux-apps.md diff --git a/tests/ci.fmf b/tests/ci.fmf index 66f6a8a..beb95c0 100644 --- a/tests/ci.fmf +++ b/tests/ci.fmf @@ -5,13 +5,13 @@ provision: prepare: how: install package: - - aspnetcore-runtime-7.0 + - aspnetcore-runtime-8.0 - babeltrace - bash-completion - bc - binutils - - dotnet-runtime-7.0 - - dotnet-sdk-7.0 + - dotnet-runtime-8.0 + - dotnet-sdk-8.0 - expect - file - findutils