Merge ~pushkarnk/ubuntu/+source/puppetdb:refix-2072516 into ubuntu/+source/puppetdb:ubuntu/devel

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

Tests passed on autopkgtest.ubuntu.com with 8.4.1-1ubuntu2

https://autopkgtest.ubuntu.com/results/autopkgtest-oracular-pushkarnk-test-builds/oracular/amd64/p/puppetdb/20241016_072430_c2156@/log.gz

[Julian Andres Klode (juliank)]

I do not think this is correct; the infrastructure already exports no_proxy, and we should not be overriding it in the tests. It would be more suitable to prepend (or append) to it, as otherwise we get regressions on changes to the infrastructure's no_proxy list.

review: Needs Fixing

522e68a... by Pushkar Kulkarni on 2024-11-18

Do not override env var no_proxy

[Pushkar Kulkarni (pushkarnk)]

> I do not think this is correct; the infrastructure already exports no_proxy,
> and we should not be overriding it in the tests. It would be more suitable to
> prepend (or append) to it, as otherwise we get regressions on changes to the
> infrastructure's no_proxy list.

Thanks for the review! I agree with this and I have updated the patch. I ran a test build in, and the autopkgtests against PPA [1]. The autopkgtest run log is [2].

[1] https://launchpad.net/~pushkarnk/+archive/ubuntu/test-ppa
[2] https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-test-ppa/plucky/amd64/p/puppetdb/20241121_073901_18bca@/log.gz

[Pushkar Kulkarni (pushkarnk)]

I updated this MP again today. puppetdb 8.4.1-3 was sync'd from debian/sid effectively undoing commit [1]. I have rebased my branch on top of the latest ubuntu/devel and made sure the lost commit was included. I also updated the changelog suitably.

[1] https://git.launchpad.net/~pushkarnk/ubuntu/+source/puppetdb/commit/?id=dd71d158595ffae86a87cfe743d74d9571c2729f

[Andreas Hasenack (ahasenack)]

Your ppa[1] build failed, as did mine in plucky just now:

2024-11-30 19:00:51.557 UTC [17546] LOG: checkpoint complete: wrote 17 buffers (0.0%); 0 WAL file(s) added, 0 removed, 0 recycled; write=0.003 s, sync=0.002 s, total=0.010 s; sync files=9, longest=0.002 s, average=0.001 s; distance=5347 kB, estimate=9942 kB; lsn=1/89EA3F8, redo lsn=1/89EA3C0

lein test puppetlabs.puppetdb.test-import

lein test puppetlabs.puppetdb.threadpool-test
Reporting unexpected error from thread testpool-1 to stderr and log
#error {
 :cause Broken!
 :via
 [{:type java.lang.RuntimeException
   :message Broken!
   :at [puppetlabs.puppetdb.threadpool_test$fn__119714$fn__119741$fn__119742$fn__119745$fn__119751 invoke threadpool_test.clj 198]}]
 :trace
 [[puppetlabs.puppetdb.threadpool_test$fn__119714$fn__119741$fn__119742$fn__119745$fn__119751 invoke threadpool_test.clj 198]
  [puppetlabs.puppetdb.threadpool$gated_execute$fn__39004 invoke threadpool.clj 68]
  [clojure.lang.AFn run AFn.java 22]
  [java.util.concurrent.ThreadPoolExecutor runWorker ThreadPoolExecutor.java 1144]
  [java.util.concurrent.ThreadPoolExecutor$Worker run ThreadPoolExecutor.java 642]
  [java.lang.Thread run Thread.java 1583]]}
589140 [testpool-1] ERROR puppetlabs.puppetdb.threadpool - Reporting unexpected error from thread testpool-1 to stderr and log
java.lang.RuntimeException: Broken!
 at puppetlabs.puppetdb.threadpool_test$fn__119714$fn__119741$fn__119742$fn__119745$fn__119751.invoke(threadpool_test.clj:198)
 at puppetlabs.puppetdb.threadpool$gated_execute$fn__39004.invoke(threadpool.clj:68)
 at clojure.lang.AFn.run(AFn.java:22)
 at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)
 at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)
 at java.base/java.lang.Thread.run(Thread.java:1583)
From error log: /tmp/tk-suppressed1732993252189-599642026.log

lein test puppetlabs.puppetdb.time-test

lein test puppetlabs.puppetdb.utils-test

lein test puppetlabs.puppetdb.utils.metrics-test

lein test puppetlabs.puppetdb.utils.string_formatter-test
{:result true, :num-tests 50, :seed 1732993252214, :time-elapsed-ms 321, :test-var "test-dash-conversions"}
{:result true, :num-tests 50, :seed 1732993252536, :time-elapsed-ms 312, :test-var "test-underscore-conversions"}

lein test puppetlabs.puppetdb.zip-test
{:result true, :num-tests 50, :seed 1732993252869, :time-elapsed-ms 893, :test-var "post-order-collect"}
{:result true, :num-tests 50, :seed 1732993253763, :time-elapsed-ms 1495, :test-var "no-op-zipper"}
{:result true, :num-tests 50, :seed 1732993255259, :time-elapsed-ms 1249, :test-var "flip-sign-zipper"}

Ran 674 tests containing 13550 assertions.
4 failures, 0 errors.
2024-11-30 19:00:56.578 UTC [17546] LOG: checkpoint starting: immediate force wait
2024-11-30 19:00:56.602 UTC [17546] LOG: checkpoint complete: wrote 51 buffers (0.0%); 0 WAL file(s) added, 0 removed, 0 recycled; write=0.009 s, sync=0.003 s, total=0.025 s; sync files=15, longest=0.002 s, average=0.001 s; distance=226 kB, estimate=8970 kB; lsn=1/8A22CA8, redo lsn=1/8A22C70
Tests failed.
++ /<<PKGBUILDDIR>>/ext/bin/pdbbox-env pg_ctl stop
waiting for serv...

[Andreas Hasenack (ahasenack)]

Questing is also failing to build. That needs to be fixed before the autopkgtest fix is considered/attempted.

Unmerged commits

d56d42f... by Pushkar Kulkarni on 2024-10-16

update changelog

522e68a... by Pushkar Kulkarni on 2024-11-18

Do not override env var no_proxy

2097f7f... by Pushkar Kulkarni on 2024-10-16

Disable squid proxy for URLs used by puppetdb tests

9204c29... by Pushkar Kulkarni on 2024-07-08

update maintainer

dd71d15... by Pushkar Kulkarni on 2024-07-08

d/t/with-puppetserver: avoid a parsing error

diff --git a/debian/changelog b/debian/changelog
index 02e43df..2022569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+puppetdb (8.4.1-3ubuntu1) plucky; urgency=medium
+
+  * d/t/common.sh: Disable proxy for URLs used by
+    puppetdb dep8 tests (LP: #2084635)
+  * d/t/with-puppetserver: avoid a parsing error
+    on lxd by surrounding the node name in quotes
+
+ -- Pushkar Kulkarni <[e-mail]>  Wed, 16 Oct 2024 11:11:09 +0530
+
 puppetdb (8.4.1-3) unstable; urgency=medium
 
   * d/patches: add patch to fix tests with pgsql 17 (Closes: #1084038)
diff --git a/debian/control b/debian/control
index 5887172..37b93b2 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/common.sh b/debian/tests/common.sh
index 47de2ca..dc8578d 100644
--- a/debian/tests/common.sh
+++ b/debian/tests/common.sh
@@ -3,6 +3,25 @@ QUERY_URL="http://localhost:8080/pdb/query/v4"
 
 set -e
 
+append_no_proxy_nodup() {
+    local entry="$1"
+    case ",$no_proxy," in
+        *",$entry,"*) return;;
+        *)
+            if [ -z "$no_proxy" ]; then
+                export no_proxy="$entry"
+            else
+                no_proxy="$no_proxy,$entry"
+            fi
+        ;;
+    esac
+}
+
+append_no_proxy_nodup "127.0.0.1"
+append_no_proxy_nodup "localhost"
+append_no_proxy_nodup ".local"
+append_no_proxy_nodup ".lxd"
+
 cleanup () {
 	retval=$?
 	set +e
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",