Merge ~sergiodj/ubuntu/+source/crmsh:fix-autopkgtest-pacemaker-node-name into ubuntu/+source/crmsh:ubuntu/devel

[Sergio Durigan Junior]

This is a fix for crmsh's autopkgtest failures.

These failures are due to:

https://code.launchpad.net/~lucaskanashiro/ubuntu/+source/corosync/+git/corosync/+merge/404328

corosync/pacemaker now name nodes using the output of "$(uname -n)", so we have to adjust the tests to account for that.

There's a PPA with the proposed package here:

https://launchpad.net/~sergiodj/+archive/ubuntu/crmsh-bug

I triggered autopkgtest runs against all architectures using the PPA, and everything passed. The results can be seen here:

https://autopkgtest.ubuntu.com/results/autopkgtest-impish-sergiodj-crmsh-bug/?format=plain

[Utkarsh Gupta (utkarsh)]

Good stuff, +1.

I know you'd have looked into forwarding to Debian and might have a reason to not to even though we have the problematic line (cf: https://salsa.debian.org/ha-team/crmsh/-/blob/master/debian/tests/pacemaker-node-status.sh#L7). Maybe because they're missing corosync stuff or something? But meh, I know you're active on the Debian side so you'd have taken care of this!

Either way, go, go, go! 🎉

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thanks for the review, Utkarsh.

Yeah, this whole "node renaming" stuff is Ubuntu-specific, and Lucas has been driving it so I'd rather let him decide what and when to send things to Debian.

Tagged & uploaded:

$ git push pkg upload/4.2.0-4ubuntu2
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.20 KiB | 614.00 KiB/s, done.
Total 10 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/crmsh
 * [new tag] upload/4.2.0-4ubuntu2 -> upload/4.2.0-4ubuntu2

(I closed my tmux window before I got a copy of the upload log)

diff --git a/debian/changelog b/debian/changelog
index 9e1899b..f80ff9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+crmsh (4.2.0-4ubuntu2) impish; urgency=medium
+
+  * d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead
+    of "node1" as the pacemaker node name.
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 07 Jul 2021 16:44:57 -0400
+
 crmsh (4.2.0-4ubuntu1) hirsute; urgency=medium
 
   * Merge with Debian; remaining changes:
diff --git a/debian/tests/pacemaker-node-status.sh b/debian/tests/pacemaker-node-status.sh
index 5b2eaaf..ed45038 100755
--- a/debian/tests/pacemaker-node-status.sh
+++ b/debian/tests/pacemaker-node-status.sh
@@ -4,7 +4,7 @@ set -ex
 
 DAEMON_TIMEOUT=60
 CRM_TIMEOUT=5
-NODE=node1
+NODE="$(uname -n)"
 
 # https://bugs.launchpad.net/bugs/1828228
 ulimit -H -l unlimited 2>/dev/null || {