Merge ~pushkarnk/ubuntu/+source/puppetdb:lp2072516 into ubuntu/+source/puppetdb:ubuntu/devel

[Pushkar Kulkarni]

debian/test/control: add allow-stderr against test standalone to accommodate a Java version warning on stderr

debian/test/with-puppetserver: the lxd hostname which also becomes 'certname' of the puppet config contains a ".", for the node definition it needs to be enclosed within ' ' to avoid a parsing error.

Tested with the above changes:

=====

$ autopkgtest \
  --shell-fail \
  --no-built-binaries \
  ./puppetdb \
  -- lxd autopkgtest/oracular/noble/amd64

...
...

autopkgtest [00:46:30]: @@@@@@@@@@@@@@@@@@@@ summary
standalone PASS
with-puppetserver PASS

=====

Full output log: https://paste.ubuntu.com/p/qQ4FsfzhVw/

[Nick Rosbrook (enr0n)]

Looks good, except that I would make the changelog match your commit messages (your commit messages are more descriptive of the changes). Besides that, LGTM.

review: Needs Fixing

[Pushkar Kulkarni (pushkarnk)]

Thanks! I've updated the changelog.

[Nick Rosbrook (enr0n)]

Sponsored. Thanks!

review: Approve

[Lukas Märdian (slyon)]

This has already been sponsored. Claiming the ~ubuntu-sponsors slot.

review: Abstain

diff --git a/debian/changelog b/debian/changelog
index 99fc277..026e57b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+puppetdb (8.4.1-1ubuntu1) oracular; urgency=medium
+
+  * Fix autopkgtest failures (LP: #2072516)
+    - d/t/control: add allow-stderr to accommodate
+      a Java version warning
+    - d/t/with-puppetserver: avoid a parsing error
+      on lxd by surrounding the node name in quotes
+
+ -- Pushkar Kulkarni <[e-mail]>  Tue, 09 Jul 2024 01:01:45 +0530
+
 puppetdb (8.4.1-1) unstable; urgency=medium
 
   * New upstream version 8.4.1 (Closes: #1062330, #1064677)
diff --git a/debian/control b/debian/control
index 72e64e8..898ac08 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: puppetdb
 Section: admin
 Priority: optional
-Maintainer: Puppet Package Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Puppet Package Maintainers <[e-mail]>
 Uploaders:
  Apollon Oikonomopoulos <[e-mail]>,
  Jérôme Charaoui <[e-mail]>,
diff --git a/debian/tests/control b/debian/tests/control
index 2ee69ad..34cffc3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -4,7 +4,7 @@ Depends:
  curl,
  jq,
  postgresql-contrib,
-Restrictions: needs-root, isolation-container
+Restrictions: needs-root, isolation-container, allow-stderr
 
 Tests: with-puppetserver
 Depends:
diff --git a/debian/tests/with-puppetserver b/debian/tests/with-puppetserver
index d9278ca..f7c3e18 100755
--- a/debian/tests/with-puppetserver
+++ b/debian/tests/with-puppetserver
@@ -53,7 +53,7 @@ EOF
 mkdir -p /etc/puppet/code/environments/production/manifests
 
 cat >/etc/puppet/code/environments/production/manifests/default.pp <<-EOF
-	node $certname {
+	node '$certname' {
 	  file { '/tmp/testfile' :
 	    ensure  => present,
 	    content => "autopkgtest\n",