From 74367be5a2c5d07077fbaa98b64cd388d2f1769d Mon Sep 17 00:00:00 2001 From: Aristeu Rozanski Date: Thu, 31 Mar 2022 10:43:03 -0400 Subject: [PATCH] Merging 2065729 fixes into 9.1 branch Resolves: #2067499 Signed-off-by: Aristeu Rozanski --- gating.yaml | 6 ++++++ rasdaemon.spec | 21 ++++++++++++++++++++- tests/basic-test.sh | 3 +++ tests/tests.yml | 9 +++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gating.yaml create mode 100644 tests/basic-test.sh create mode 100644 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..648918d --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/rasdaemon.spec b/rasdaemon.spec index 4e8dc6b..ab376cc 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -1,6 +1,6 @@ Name: rasdaemon Version: 0.6.7 -Release: 1%{?dist} +Release: 6%{?dist} Summary: Utility to receive RAS error tracings License: GPLv2 URL: http://git.infradead.org/users/mchehab/rasdaemon.git @@ -97,6 +97,9 @@ install -D -p -m 0644 misc/ras-mc-ctl.service %{buildroot}%{_unitdir}/ras-mc-ctl rm INSTALL %{buildroot}/usr/include/*.h mkdir -p %{buildroot}/%{_sharedstatedir}/rasdaemon install -d -p -m 0755 %{buildroot}/%{_sharedstatedir}/rasdaemon +mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig +install -D -p -m 0644 misc/rasdaemon.env %{buildroot}/%{_sysconfdir}/sysconfig/rasdaemon +sed -i "s/^PAGE_CE_ACTION=.*/PAGE_CE_ACTION=account/" %{buildroot}/%{_sysconfdir}/sysconfig/rasdaemon %files %doc AUTHORS ChangeLog COPYING README TODO @@ -106,8 +109,24 @@ install -d -p -m 0755 %{buildroot}/%{_sharedstatedir}/rasdaemon %{_unitdir}/*.service %{_sharedstatedir}/rasdaemon %{_sysconfdir}/ras/dimm_labels.d +%{_sysconfdir}/sysconfig/rasdaemon %changelog +* Thu Mar 31 2022 Aristeu Rozanski 0.6.7-6 +- Merging 2065729 fixes into 9.1 branch [2067499] + +* Thu Mar 24 2022 Aristeu Rozanski 0.6.7-5 +- Trying to guess what's going on on the testing side [2065729] + +* Thu Mar 24 2022 Aristeu Rozanski 0.6.7-4 +- Adding simple test to stop being gated [2065729] + +* Thu Mar 24 2022 Aristeu Rozanski 0.6.7-3 +- Adding gating.yaml [2065729] + +* Fri Mar 18 2022 Aristeu Rozanski 0.6.7-2 +- Adding missing rasdaemon environment configuration to /etc/sysconfig/rasdaemon [2065729] + * Tue Feb 08 2022 Aristeu Rozanski 0.6.7-1 - Bumped to 0.6.7 - Backported patches that sit on top of 0.6.7 without being released diff --git a/tests/basic-test.sh b/tests/basic-test.sh new file mode 100644 index 0000000..8a5a90e --- /dev/null +++ b/tests/basic-test.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +(systemctl start rasdaemon && systemctl status rasdaemon && ras-mc-ctl --summary && echo "PASS" && exit 0) || (echo "FAIL"; exit 1;) diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..601a7db --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,9 @@ +- hosts: localhost + roles: + - role: standard-test-basic # this is a standard test role, it takes care of the test environment, logging, archiving results.. + tags: + - classic + tests: + - simple: + dir: . + run: "./basic-test.sh" # this is your test command, its exit code is the outcome of the test