From f073bf4a3309e8071d10abe5078beea12f7323d6 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Fri, 2 Jun 2023 09:17:16 -0400 Subject: [PATCH] Updates to core file processing Provisioning-pool: bmurrell-automate EL9-VM9-label: stage_vm9 Repo-files-PR: PR-16 PR-repos-ubuntu20: hdf5@PR-38:8 ior@PR-10:7 hdf5-vol-daos@PR-38:14 mpifileutils-pkg@PR-34:7 PR-repos-el8: dpdk@master spdk@master:lastBuild testmpio@PR-9:lastBuild PR-repos-el9: testmpio@PR-9:lastBuild PR-repos-leap15: testmpio@PR-9:lastBuild PR-repos: argobots@PR-24 raft@PR-72 isa-l@PR-11 isa-l_crypto@PR-9 mercury@PR-102:lastBuild dpdk@PR-26 spdk@PR-59:lastBuild mpich@PR-64 hdf5@PR-39:lastBuild ior@PR-10:lastBuild dtcmp@PR-6:lastBuild lwgrp@PR-6 libcircle@PR-6:lastBuild hdf5-vol-daos@PR-38:lastBuild mpifileutils-pkg@PR-34:lastBuild MACSio@PR-12:lastBuild json-cwx@PR-4 Skip-PR-comments: true Quick-functional: true Skip-build-ubuntu20-rpm: true Skip-build-el8-rpm: false Skip-build-leap15-rpm: true Skip-build-el8-gcc: true Skip-build-el8-gcc-debug: true Skip-build-el8-gcc-release: true Skip-build-leap15-gcc: true Skip-build-leap15-icc: true Skip-build-ubuntu-clang: true Skip-func-hw-test: true Test-tag: core_files Fixes: DAOS-12427 Required-githooks: true Signed-off-by: Brian J. Murrell --- src/tests/ftest/process_core_files.py | 14 +++++++++++--- utils/rpms/daos.spec | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/tests/ftest/process_core_files.py b/src/tests/ftest/process_core_files.py index e964a31bb690..3a6ecf20439d 100644 --- a/src/tests/ftest/process_core_files.py +++ b/src/tests/ftest/process_core_files.py @@ -222,8 +222,16 @@ def install_debuginfo_packages(self): self.log.info("Installing debuginfo packages for stacktrace creation") install_pkgs = [{'name': 'gdb'}] if self.is_el(): - install_pkgs.append({'name': 'python3-debuginfo'}) - + if self.distro_info.name.lower() == "almalinux": + # pylint: disable=consider-using-f-string + install_pkgs.append({'name': 'python%s.%s-debuginfo' % (sys.version_info.major, + sys.version_info.minor)}) + elif self.distro_info.name.lower() == "rocky": + # https://bugs.rockylinux.org/view.php?id=3499 + pass + else: + # pylint: disable=consider-using-f-string + install_pkgs.append({'name': 'python%s-debuginfo' % sys.version_info.major}) cmds = [] # -debuginfo packages that don't get installed with debuginfo-install @@ -252,7 +260,7 @@ def install_debuginfo_packages(self): "python36", "openmpi3", "gcc"]) elif self.is_el() and int(self.distro_info.version) >= 8: dnf_args.extend( - ["--enablerepo=*-debuginfo", "libpmemobj", "python3", "openmpi", "gcc"]) + ["libpmemobj", "python3", "openmpi", "gcc"]) else: raise RunException(f"Unsupported distro: {self.distro_info}") cmds.append(["sudo", "dnf", "-y", "install"] + dnf_args) diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index f75bd8c9cc83..c5591efebb43 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -240,10 +240,10 @@ Summary: The DAOS client test suite - tools which need openmpi Requires: %{name}-client-tests%{?_isa} = %{version}-%{release} Requires: hdf5-%{openmpi}-tests Requires: hdf5-vol-daos-%{openmpi}-tests +Requires: MACSio-%{openmpi} # DO NOT LAND -- temporary until we have these tools %if (0%{?rhel} < 9) Requires: simul-%{openmpi} -Requires: MACSio-%{openmpi} %endif %description client-tests-openmpi @@ -259,10 +259,10 @@ Requires: mpich Requires: ior Requires: hdf5-mpich-tests Requires: hdf5-vol-daos-mpich-tests +Requires: MACSio-mpich # DO NOT LAND -- temporary until we have these tools %if (0%{?rhel} < 9) Requires: simul-mpich -Requires: MACSio-mpich Requires: romio-tests %endif