From 01461b1d906903f4f79ec7bbf436053872c2207b Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Thu, 14 Jul 2022 13:14:32 +0200 Subject: [PATCH] - ocf-tester: add testing tool Resolves: rhbz#2103374 --- bz2103374-ocf-tester-update.patch | 39 +++++++++++++++++++++++++++++++ resource-agents.spec | 14 +++++++---- 2 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 bz2103374-ocf-tester-update.patch diff --git a/bz2103374-ocf-tester-update.patch b/bz2103374-ocf-tester-update.patch new file mode 100644 index 0000000..0e32ed2 --- /dev/null +++ b/bz2103374-ocf-tester-update.patch @@ -0,0 +1,39 @@ +From 46e8d346ca4803245f51a157591c4df1126d3b49 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 12 Jul 2022 12:45:52 +0200 +Subject: [PATCH] ocf-tester: use promotable terms + +--- + tools/ocf-tester.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/ocf-tester.in b/tools/ocf-tester.in +index 10822a5a06..f1703ba1b7 100755 +--- a/tools/ocf-tester.in ++++ b/tools/ocf-tester.in +@@ -295,10 +295,10 @@ if [ $rc -eq 3 ]; then + + elif [ $rc -eq 8 ]; then + test_command demote "Cleanup, demote" +- assert $? 0 "Your agent was a master and could not be demoted" 1 ++ assert $? 0 "Your agent was promoted and could not be demoted" 1 + + test_command stop "Cleanup, stop" +- assert $? 0 "Your agent was a master and could not be stopped" 1 ++ assert $? 0 "Your agent was promoted and could not be stopped" 1 + + elif [ $rc -ne 7 ]; then + test_command stop +@@ -370,10 +370,10 @@ if [ $has_promote -eq 1 -a $has_demote -eq 1 ]; then + assert $? 0 "Demote failed" 1 + + elif [ $has_promote -eq 0 -a $has_demote -eq 0 ]; then +- info "* Your agent does not support master/slave (optional)" ++ info "* Your agent does not support promotable clones (optional)" + + else +- echo "* Your agent partially supports master/slave" ++ echo "* Your agent partially supports promotable clones" + num_errors=`expr $num_errors + 1` + fi + diff --git a/resource-agents.spec b/resource-agents.spec index 3557bce..96ad544 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.10.0 -Release: 20%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 21%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -75,6 +75,7 @@ Patch22: bz2083090-openstack-info-fix-bashism.patch Patch23: bz2083081-bz2083086-bz2083092-openstack-agents-fixes.patch Patch24: bz2083081-bz2083086-bz2083090-bz2083092-openstack-agents-warn-when-openstackcli-slow.patch Patch25: bz2083081-bz2083086-bz2083090-bz2083092-openstack-agents-set-domain-parameters-default.patch +Patch26: bz2103374-ocf-tester-update.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aws.patch @@ -224,6 +225,7 @@ exit 1 %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 # bundled ha-cloud-support libs %patch500 -p1 @@ -336,6 +338,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %exclude %{_datadir}/%{name}/ocft/runocft %exclude %{_datadir}/%{name}/ocft/runocft.prereq +%{_sbindir}/ocf-tester %{_sbindir}/ocft %{_includedir}/heartbeat @@ -347,6 +350,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %endif %{_mandir}/man7/*.7* +%{_mandir}/man8/ocf-tester.8* ### # Supported, but in another sub package @@ -504,9 +508,6 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents ### # Other excluded files. ### -# This tool has to be updated for the new pacemaker lrmd. -%exclude %{_sbindir}/ocf-tester -%exclude %{_mandir}/man8/ocf-tester.8* # ldirectord is not supported %exclude /etc/ha.d/resource.d/ldirectord %exclude %{_sysconfdir}/init.d/ldirectord @@ -546,6 +547,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Thu Jul 14 2022 Oyvind Albrigtsen - 4.10.0-21 +- ocf-tester: add testing tool + + Resolves: rhbz#2103374 + * Thu Jul 14 2022 Oyvind Albrigtsen - 4.10.0-20 - openstack-cinder-volume/openstack-floating-ip/openstack-info/ openstack-virtual-ip: new resource agents