Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2026-04-12 17:53:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new.21863 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh" Sun Apr 12 17:53:04 2026 rev:404 rq:1346179 version:5.0.0+20260412.db68d024 Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2026-04-07 16:50:04.243423622 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new.21863/crmsh.changes 2026-04-12 17:53:08.025173387 +0200 @@ -1,0 +2,9 @@ +Sun Apr 12 03:44:20 UTC 2026 - [email protected] + +- Update to version 5.0.0+20260412.db68d024: + * Dev: behave: Adjust functional test for previous commit + * Dev: unittests: Adjust unit test for previous commit + * Dev: bootstrap: Still set deprecated properties during bootstrap + * Dev: ui_configure: Don't hide deprecated properties from the completion results + +------------------------------------------------------------------- Old: ---- crmsh-5.0.0+20260407.ce740ef1.tar.bz2 New: ---- crmsh-5.0.0+20260412.db68d024.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.Azt82g/_old 2026-04-12 17:53:08.645198634 +0200 +++ /var/tmp/diff_new_pack.Azt82g/_new 2026-04-12 17:53:08.649198796 +0200 @@ -41,7 +41,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0-or-later Group: %{pkg_group} -Version: 5.0.0+20260407.ce740ef1 +Version: 5.0.0+20260412.db68d024 Release: 0 URL: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Azt82g/_old 2026-04-12 17:53:08.701200914 +0200 +++ /var/tmp/diff_new_pack.Azt82g/_new 2026-04-12 17:53:08.705201077 +0200 @@ -9,7 +9,7 @@ </service> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">ce740ef16bab35ffcedf5eadd8dcbf27ba57bdb6</param> + <param name="changesrevision">cf3a81412188c120b0b69ee59c2066143aec463f</param> </service> </servicedata> (No newline at EOF) ++++++ crmsh-5.0.0+20260407.ce740ef1.tar.bz2 -> crmsh-5.0.0+20260412.db68d024.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/crmsh/bootstrap.py new/crmsh-5.0.0+20260412.db68d024/crmsh/bootstrap.py --- old/crmsh-5.0.0+20260407.ce740ef1/crmsh/bootstrap.py 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/crmsh/bootstrap.py 2026-04-12 04:54:18.000000000 +0200 @@ -1496,7 +1496,7 @@ logger.info("Loading initial cluster configuration") - crm_configure_load("update", """property cib-bootstrap-options: fencing-enabled=false + crm_configure_load("update", """property cib-bootstrap-options: stonith-enabled=false op_defaults op-options: timeout=600 rsc_defaults rsc-options: resource-stickiness=1 migration-threshold=3 """) @@ -2805,7 +2805,7 @@ """ value = get_fencing_timeout_generally_expected() if value: - utils.set_property("fencing-timeout", value, conditional=True) + utils.set_property("stonith-timeout", value, conditional=True) def adjust_properties(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/crmsh/crash_test/utils.py new/crmsh-5.0.0+20260412.db68d024/crmsh/crash_test/utils.py --- old/crmsh-5.0.0+20260407.ce740ef1/crmsh/crash_test/utils.py 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/crmsh/crash_test/utils.py 2026-04-12 04:54:18.000000000 +0200 @@ -122,7 +122,8 @@ action_result = crmshutils.get_property("fencing-action") supported_actions = ra.get_property_options("fencing-action") if action_result is None or action_result not in supported_actions: - msg_error(f"Cluster property \"fencing-action\" should be {'|'.join(supported_actions)}") + current_action_term = crmshutils.DeprecatedTermTranslator.get_working_term("stonith-action") + msg_error(f"Cluster property \"{current_action_term}\" should be {'|'.join(supported_actions)}") return None return action_result diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/crmsh/qdevice.py new/crmsh-5.0.0+20260412.db68d024/crmsh/qdevice.py --- old/crmsh-5.0.0+20260407.ce740ef1/crmsh/qdevice.py 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/crmsh/qdevice.py 2026-04-12 04:54:18.000000000 +0200 @@ -545,7 +545,7 @@ sbd_watchdog_timeout_qdevice = sbd.SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE sbd.SBDManager.update_sbd_configuration({"SBD_WATCHDOG_TIMEOUT": str(sbd_watchdog_timeout_qdevice)}) if self.is_stage: - utils.set_property("fencing-watchdog-timeout", 2*sbd_watchdog_timeout_qdevice) + utils.set_property("stonith-watchdog-timeout", 2*sbd_watchdog_timeout_qdevice) @qnetd_lock_for_same_cluster_name def certificate_and_config_qdevice(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/crmsh/sbd.py new/crmsh-5.0.0+20260412.db68d024/crmsh/sbd.py --- old/crmsh-5.0.0+20260407.ce740ef1/crmsh/sbd.py 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/crmsh/sbd.py 2026-04-12 04:54:18.000000000 +0200 @@ -660,9 +660,9 @@ def _get_current_terms(self): - self.current_watchdog_timeout_term = utils.DeprecatedTermTranslator.get_working_term("fencing-watchdog-timeout") - self.current_timeout_term = utils.DeprecatedTermTranslator.get_working_term("fencing-timeout") - self.current_enabled_term = utils.DeprecatedTermTranslator.get_working_term("fencing-enabled") + self.current_watchdog_timeout_term = utils.DeprecatedTermTranslator.get_working_term("stonith-watchdog-timeout") + self.current_timeout_term = utils.DeprecatedTermTranslator.get_working_term("stonith-timeout") + self.current_enabled_term = utils.DeprecatedTermTranslator.get_working_term("stonith-enabled") def check_and_fix(self) -> CheckResult: if not ServiceManager().service_is_active(constants.SBD_SERVICE): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/crmsh/ui_configure.py new/crmsh-5.0.0+20260412.db68d024/crmsh/ui_configure.py --- old/crmsh-5.0.0+20260407.ce740ef1/crmsh/ui_configure.py 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/crmsh/ui_configure.py 2026-04-12 04:54:18.000000000 +0200 @@ -254,7 +254,7 @@ elif '=' in completing: return [] command.enable_custom_sort_order() - return utils.filter_keys(agent.get_param_list_without_deprecated(), args) + return utils.filter_keys(agent.params(), args) def _prim_meta_completer(agent, args): @@ -632,7 +632,7 @@ @command.name("get_property") @command.alias("get-property") @command.skill_level('administrator') - @command.completers_repeating(compl.call(ra.get_properties_without_deprecated)) + @command.completers_repeating(compl.call(ra.get_properties_list)) def do_get_property(self, context, *args): "usage: get-property [-t|--true [<name>...]" utils.load_cib_file_env() @@ -640,7 +640,7 @@ truth = any(a for a in args if a in ('-t', '--true')) if not properties: - utils.multicolumn(ra.get_properties_without_deprecated()) + utils.multicolumn(ra.get_properties_list()) return def print_value(v): @@ -1174,7 +1174,7 @@ "usage: property [$id=<set_id>] <option>=<value>" self.__override_lower_level_attrs(*args) if not args: - utils.multicolumn(ra.get_properties_without_deprecated()) + utils.multicolumn(ra.get_properties_list()) return return self.__conf_object(context.get_command_name(), *args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/test/features/bootstrap_sbd_delay.feature new/crmsh-5.0.0+20260412.db68d024/test/features/bootstrap_sbd_delay.feature --- old/crmsh-5.0.0+20260407.ce740ef1/test/features/bootstrap_sbd_delay.feature 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/test/features/bootstrap_sbd_delay.feature 2026-04-12 04:54:18.000000000 +0200 @@ -115,11 +115,6 @@ When Try "crm configure property fencing-watchdog-timeout=1" on "hanode1" Then Except "It's required to set fencing-watchdog-timeout to at least 2*SBD_WATCHDOG_TIMEOUT: 30" in stderr - # Expect successfully set stonith-watchdog-timeout=5 since already set fencing-watchdog-timeout - When Run "crm configur proerty stonith-watchdog-timeout=5" on "hanode1" - Then Cluster property "fencing-watchdog-timeout" is "30" - When Try "crm -F configure filter "sed 's/fencing-watchdog-timeout=30/#fencing-watchdog-timeout=30/g'"" on "hanode1" - Then Expected "It's required to set stonith-watchdog-timeout to at least 2*SBD_WATCHDOG_TIMEOUT: 30" in stderr Then Cluster property "fencing-watchdog-timeout" is "30" @clean @@ -402,11 +397,11 @@ When Run "crm cluster init sbd -S -y" on "hanode1" Then Service "sbd" is "started" on "hanode1" And Service "sbd" is "started" on "hanode2" - # Delete fencing-watchdog-timeout - When Delete property "fencing-watchdog-timeout" from cluster + # Delete stonith-watchdog-timeout + When Delete property "stonith-watchdog-timeout" from cluster When Try "crm sbd configure show" on "hanode1" - Then Expected "It's required that fencing-watchdog-timeout is set to 30, now is not set" in stderr + Then Expected "It's required that stonith-watchdog-timeout is set to 30, now is not set" in stderr When Try "crm cluster health sbd" on "hanode1" - Then Expected "It's required that fencing-watchdog-timeout is set to 30, now is not set" in stderr + Then Expected "It's required that stonith-watchdog-timeout is set to 30, now is not set" in stderr When Run "crm cluster health sbd --fix" on "hanode1" Then Expected "SBD: Check sbd timeout configuration: OK" in stdout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/test/features/sbd_ui.feature new/crmsh-5.0.0+20260412.db68d024/test/features/sbd_ui.feature --- old/crmsh-5.0.0+20260407.ce740ef1/test/features/sbd_ui.feature 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/test/features/sbd_ui.feature 2026-04-12 04:54:18.000000000 +0200 @@ -111,11 +111,11 @@ When Run "crm sbd configure crashdump-watchdog-timeout=60" on "hanode1" Then Run "crm sbd configure show sysconfig |grep SBD_TIMEOUT_ACTION=flush,crashdump" OK Then Run "crm sbd configure show sysconfig |grep "SBD_OPTS=\"-C 60 -Z\""" OK - Then Run "crm sbd configure show property |grep fencing-watchdog-timeout=75" OK + Then Run "crm sbd configure show property |grep stonith-watchdog-timeout=75" OK When Run "crm sbd configure crashdump-watchdog-timeout=60" on "hanode1" Then Expected "No change in SBD configuration" in stdout When Run "crm sbd configure crashdump-watchdog-timeout=10" on "hanode1" - Then Run "crm sbd configure show property |grep fencing-watchdog-timeout=30" OK + Then Run "crm sbd configure show property |grep stonith-watchdog-timeout=30" OK # Purge crashdump When Run "crm sbd purge crashdump" on "hanode1" When Try "crm sbd configure show sysconfig |grep SBD_TIMEOUT_ACTION=flush,crashdump" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/test/unittests/test_bootstrap.py new/crmsh-5.0.0+20260412.db68d024/test/unittests/test_bootstrap.py --- old/crmsh-5.0.0+20260407.ce740ef1/test/unittests/test_bootstrap.py 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/test/unittests/test_bootstrap.py 2026-04-12 04:54:18.000000000 +0200 @@ -1498,7 +1498,7 @@ def test_adjust_fencing_timeout(self, mock_get_timeout, mock_set): mock_get_timeout.return_value = 30 bootstrap.adjust_fencing_timeout() - mock_set.assert_called_once_with("fencing-timeout", 30, conditional=True) + mock_set.assert_called_once_with("stonith-timeout", 30, conditional=True) @mock.patch('crmsh.utils.set_property') def test_adjust_priority_in_rsc_defaults_2node(self, mock_set): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/test/unittests/test_crashtest_utils.py new/crmsh-5.0.0+20260412.db68d024/test/unittests/test_crashtest_utils.py --- old/crmsh-5.0.0+20260407.ce740ef1/test/unittests/test_crashtest_utils.py 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/test/unittests/test_crashtest_utils.py 2026-04-12 04:54:18.000000000 +0200 @@ -76,12 +76,14 @@ self.assertEqual(res, True) mock_get_property.assert_called_once_with("fencing-enabled") + @mock.patch('crmsh.utils.DeprecatedTermTranslator.get_working_term') @mock.patch('crmsh.crash_test.utils.msg_error') @mock.patch('crmsh.ra.get_property_options') @mock.patch('crmsh.crash_test.utils.crmshutils.get_property') - def test_fence_action_none(self, mock_get_property, mock_get_property_options, mock_error): + def test_fence_action_none(self, mock_get_property, mock_get_property_options, mock_error, mock_get_working_term): mock_get_property_options.return_value = ["off", "reboot"] mock_get_property.return_value = None + mock_get_working_term.return_value = "fencing-action" res = self.fence_info_inst.fence_action self.assertEqual(res, None) mock_get_property.assert_called_once_with("fencing-action") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-5.0.0+20260407.ce740ef1/test/unittests/test_qdevice.py new/crmsh-5.0.0+20260412.db68d024/test/unittests/test_qdevice.py --- old/crmsh-5.0.0+20260407.ce740ef1/test/unittests/test_qdevice.py 2026-04-07 07:59:59.000000000 +0200 +++ new/crmsh-5.0.0+20260412.db68d024/test/unittests/test_qdevice.py 2026-04-12 04:54:18.000000000 +0200 @@ -708,7 +708,7 @@ mock_get_sbd_value.assert_called_once_with("SBD_WATCHDOG_TIMEOUT") mock_update_config.assert_called_once_with({"SBD_WATCHDOG_TIMEOUT": str(sbd.SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE)}) - mock_set.assert_called_once_with("fencing-watchdog-timeout", 2*sbd.SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE) + mock_set.assert_called_once_with("stonith-watchdog-timeout", 2*sbd.SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE) @mock.patch('crmsh.sh.cluster_shell') @mock.patch('crmsh.utils.cluster_run_cmd')
