diff -Nru crmsh-4.4.0/debian/changelog crmsh-4.4.0/debian/changelog --- crmsh-4.4.0/debian/changelog 2022-05-31 21:04:36.000000000 +0000 +++ crmsh-4.4.0/debian/changelog 2023-01-04 19:37:04.000000000 +0000 @@ -1,3 +1,36 @@ +crmsh (4.4.0-3ubuntu1~ppa1) lunar; urgency=medium + + * Merge with Debian unstable (LP: #1993394). Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + * Dropped: + - d/t/pacemaker-node-status.sh: Get the node name with "crm_node -n" + instead of using "corosync-cmapctl". Ubuntu's corosync default + configuration file does not set the node name. + [ applied in Debian version 4.4.0-2 ] + * Added: + - d/t/control: add fence-virt as dependency of utils.sh. + - d/t/utils.sh: use fence-virt package instead of vim. + The test tries to remove the chosen package and vim is a + dependency of ubuntu-server and cannot be removed. + + -- Lucas Kanashiro Wed, 04 Jan 2023 16:37:04 -0300 + +crmsh (4.4.0-3) unstable; urgency=medium + + * d/patches: fix crmadmin parsing (Closes: #1023824) + * d/tests: add test for resource restart + + -- Valentin Vidic Sun, 13 Nov 2022 13:18:35 +0100 + +crmsh (4.4.0-2) unstable; urgency=medium + + * d/tests: update node status test + * d/patches: fix build with new version of setuptools + * d/patches: fix typo in patch description + * d/lintian-overrides: update format for new lintian + + -- Valentin Vidic Sat, 15 Oct 2022 14:49:18 +0200 + crmsh (4.4.0-1ubuntu1) kinetic; urgency=medium * Merge with Debian unstable (LP: #1971271, #1972730). Remaining changes: diff -Nru crmsh-4.4.0/debian/crmsh.lintian-overrides crmsh-4.4.0/debian/crmsh.lintian-overrides --- crmsh-4.4.0/debian/crmsh.lintian-overrides 2022-05-30 21:09:00.000000000 +0000 +++ crmsh-4.4.0/debian/crmsh.lintian-overrides 2023-01-04 19:32:18.000000000 +0000 @@ -1,3 +1,3 @@ -crmsh: spare-manual-page usr/share/man/man8/crmsh_crm_report.8.gz -crmsh: national-encoding usr/share/crmsh/tests/unittests/pacemaker_unicode.log -crmsh: package-contains-documentation-outside-usr-share-doc usr/share/crmsh/tests/bugs-test.txt +crmsh: spare-manual-page [usr/share/man/man8/crmsh_crm_report.8.gz] +crmsh: national-encoding [usr/share/crmsh/tests/unittests/pacemaker_unicode.log] +crmsh: package-contains-documentation-outside-usr-share-doc [usr/share/crmsh/tests/bugs-test.txt] diff -Nru crmsh-4.4.0/debian/patches/0017-Fix-profiles-adoc.patch crmsh-4.4.0/debian/patches/0017-Fix-profiles-adoc.patch --- crmsh-4.4.0/debian/patches/0017-Fix-profiles-adoc.patch 2022-05-30 21:09:00.000000000 +0000 +++ crmsh-4.4.0/debian/patches/0017-Fix-profiles-adoc.patch 2023-01-04 19:32:18.000000000 +0000 @@ -1,4 +1,4 @@ -Description: Skip building profiles as a seperate document +Description: Skip building profiles as a separate document It is included in crm(8) already. Author: Valentin Vidic Last-Update: 2022-05-28 diff -Nru crmsh-4.4.0/debian/patches/0018-Fix-python3-install.patch crmsh-4.4.0/debian/patches/0018-Fix-python3-install.patch --- crmsh-4.4.0/debian/patches/0018-Fix-python3-install.patch 1970-01-01 00:00:00.000000000 +0000 +++ crmsh-4.4.0/debian/patches/0018-Fix-python3-install.patch 2023-01-04 19:32:18.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix build failure with new version of setuptools + Files get installed in /usr/local. +Author: Valentin Vidic +Last-Update: 2022-10-15 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Makefile.am ++++ b/Makefile.am +@@ -69,6 +69,7 @@ + $(PYTHON) $(srcdir)/setup.py install \ + --root $(DESTDIR)/// \ + $(python_prefix) \ ++ --install-layout=deb \ + --record $(DESTDIR)$(pkgpythondir)/install_files.txt \ + --verbose + $(INSTALL) -d -m 770 $(DESTDIR)$(CRM_CACHE_DIR) diff -Nru crmsh-4.4.0/debian/patches/0019-Fix-crmadmin-parsing.patch crmsh-4.4.0/debian/patches/0019-Fix-crmadmin-parsing.patch --- crmsh-4.4.0/debian/patches/0019-Fix-crmadmin-parsing.patch 1970-01-01 00:00:00.000000000 +0000 +++ crmsh-4.4.0/debian/patches/0019-Fix-crmadmin-parsing.patch 2023-01-04 19:32:18.000000000 +0000 @@ -0,0 +1,36 @@ +From f83aa41185dbc71a25a3def39d42356e503b1f96 Mon Sep 17 00:00:00 2001 +From: liangxin1300 +Date: Wed, 11 May 2022 11:09:28 +0800 +Subject: [PATCH] Fix: utils: wait4dc: Make change since output of 'crmadmin + -S' changed(bsc#1199412) + +--- + crmsh/utils.py | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/crmsh/utils.py b/crmsh/utils.py +index 9f2603a1..9ebce28f 100644 +--- a/crmsh/utils.py ++++ b/crmsh/utils.py +@@ -895,15 +895,10 @@ def wait4dc(what="", show_progress=True): + return False + cmd = "crmadmin -S %s" % dc + rc, s = get_stdout(add_sudo(cmd)) +- if not s.startswith("Status"): +- logger.warning("%s unexpected output: %s (exit code: %d)", cmd, s, rc) +- return False +- try: +- dc_status = s.split()[-2] +- except: +- logger.warning("%s unexpected output: %s", cmd, s) ++ if rc != 0: ++ logger.error("Exit code of command {} is {}".format(cmd, rc)) + return False +- if dc_status == "S_IDLE": ++ if re.search("S_IDLE.*ok", s): + if output_started: + sys.stderr.write(" done\n") + return True +-- +2.38.1 + diff -Nru crmsh-4.4.0/debian/patches/series crmsh-4.4.0/debian/patches/series --- crmsh-4.4.0/debian/patches/series 2022-05-30 21:16:13.000000000 +0000 +++ crmsh-4.4.0/debian/patches/series 2023-01-04 19:32:18.000000000 +0000 @@ -11,3 +11,5 @@ 0015-Fix-testsuite-errors.patch 0016-Fix-python2-calls.patch 0017-Fix-profiles-adoc.patch +0018-Fix-python3-install.patch +0019-Fix-crmadmin-parsing.patch diff -Nru crmsh-4.4.0/debian/tests/control crmsh-4.4.0/debian/tests/control --- crmsh-4.4.0/debian/tests/control 2022-05-31 21:02:13.000000000 +0000 +++ crmsh-4.4.0/debian/tests/control 2023-01-04 19:37:04.000000000 +0000 @@ -11,7 +11,7 @@ Restrictions: needs-root Tests: utils.sh -Depends: crmsh +Depends: crmsh, fence-virt Restrictions: needs-root, allow-stderr Tests: testsuite.sh diff -Nru crmsh-4.4.0/debian/tests/pacemaker-basic-resource.sh crmsh-4.4.0/debian/tests/pacemaker-basic-resource.sh --- crmsh-4.4.0/debian/tests/pacemaker-basic-resource.sh 2022-05-30 20:47:59.000000000 +0000 +++ crmsh-4.4.0/debian/tests/pacemaker-basic-resource.sh 2023-01-04 19:32:18.000000000 +0000 @@ -56,6 +56,19 @@ fi # +# restart +# + +crm resource restart $RSC_NAME +sleep $CRM_TIMEOUT +if rsc_check "Started" ; then + : INFO resource restart OK +else + : ERROR failed to restart resource + exit 1 +fi + +# # stop # diff -Nru crmsh-4.4.0/debian/tests/pacemaker-node-status.sh crmsh-4.4.0/debian/tests/pacemaker-node-status.sh --- crmsh-4.4.0/debian/tests/pacemaker-node-status.sh 2022-05-31 21:01:50.000000000 +0000 +++ crmsh-4.4.0/debian/tests/pacemaker-node-status.sh 2023-01-04 19:33:23.000000000 +0000 @@ -19,12 +19,17 @@ service pacemaker start sleep $DAEMON_TIMEOUT -POS="$(corosync-cmapctl -q -g nodelist.local_node_pos)" # Get the node name as sugested in # https://lists.clusterlabs.org/pipermail/users/2022-May/030309.html NODE="$(crm_node -n)" -IP="$(corosync-cmapctl -q -g nodelist.node.$POS.ring0_addr)" -echo "$IP $NODE" >> /etc/hosts +if [ -z "$NODE" ]; then + echo "Could not detect node name" + exit 1 +fi +# crmsh will try to ping the node name so make sure it can be resolved +if ! getent hosts "$NODE" >/dev/null 2>&1; then + echo "127.0.0.1 $NODE" >> /etc/hosts +fi # # online diff -Nru crmsh-4.4.0/debian/tests/utils.sh crmsh-4.4.0/debian/tests/utils.sh --- crmsh-4.4.0/debian/tests/utils.sh 2022-05-30 20:47:59.000000000 +0000 +++ crmsh-4.4.0/debian/tests/utils.sh 2023-01-04 19:37:04.000000000 +0000 @@ -3,7 +3,7 @@ set -ex export LC_ALL=C -PKG=vim +PKG=fence-virt dpkg --purge $PKG