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

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

Built and tested in ppa:pushkarnk/ppa-12-2025

    + ✅ puppetdb on resolute for amd64 @ 27.11.25 13:51:33
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-pushkarnk-ppa-12-2025/resolute/amd64/p/puppetdb/20251127_135133_3ca18@/log.gz
    + ✅ puppetdb on resolute for arm64 @ 27.11.25 13:58:53
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-pushkarnk-ppa-12-2025/resolute/arm64/p/puppetdb/20251127_135853_a9696@/log.gz
    + ✅ puppetdb on resolute for armhf @ 27.11.25 13:35:33
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-pushkarnk-ppa-12-2025/resolute/armhf/p/puppetdb/20251127_133533_3670f@/log.gz
    + ✅ puppetdb on resolute for i386 @ 27.11.25 13:51:41
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-pushkarnk-ppa-12-2025/resolute/i386/p/puppetdb/20251127_135141_e225d@/log.gz
    + ✅ puppetdb on resolute for ppc64el @ 27.11.25 13:31:28
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-pushkarnk-ppa-12-2025/resolute/ppc64el/p/puppetdb/20251127_133128_488e2@/log.gz
    + ✅ puppetdb on resolute for s390x @ 27.11.25 13:52:04
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-pushkarnk-ppa-12-2025/resolute/s390x/p/puppetdb/20251127_135204_75337@/log.gz

The tests fail with all-proposed=1 because of installability issues with puppetserver.

Unmerged commits

5065a3b... by Pushkar Kulkarni on 2025-11-27

update maintainer

4f7f927... by Pushkar Kulkarni on 2025-11-27

update changelog

9895cfc... by Pushkar Kulkarni on 2025-11-27

d/control: add explicit b-d postgresql-common-dev for tests

54c54b9... by Pushkar Kulkarni on 2024-10-16

Disable squid proxy for URLs used by puppetdb tests

4de7dc8... by Pushkar Kulkarni on 2025-11-27

d/control: add b-d junit5 to satisfy junit-bom dependency

77e5cd7... by Pushkar Kulkarni on 2025-11-27

d/patches: Avoid snakeyaml version conflict

50e9f4a... by Pushkar Kulkarni on 2025-11-27

d/patches: Skip failing command tests

diff --git a/debian/changelog b/debian/changelog
index 9c09a4e..421cca3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+puppetdb (8.8.1-1~exp1ubuntu1) resolute; urgency=medium
+
+  * d/control: add b-d junit5 to satisfy new junit-bom
+    dependency of libpostgresql-jdbc-java 42.7.7-1
+  * d/control: add b-d postgresql-common-dev because
+    the postgresql-common->postgresql-common-dev
+    dependency was dropped
+  * d/patches: update patch to avoid snakeyaml version
+    conflict
+  * d/patches: add patch to skip command tests failing
+    with libpostgresql-jdbc-java 42.7.7-1 and above
+  * d/t/common.sh: disable proxy for URLs by puppetdb's
+    dep8 tests (LP: #2072516).
+
+ -- Pushkar Kulkarni <[e-mail]>  Thu, 27 Nov 2025 16:55:54 +0530
+
 puppetdb (8.8.1-1~exp1) unstable; urgency=medium
 
   * New upstream version 8.8.1
diff --git a/debian/control b/debian/control
index b8449f3..de4ecf3 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]>,
@@ -11,6 +12,7 @@ Build-Depends:
  default-jdk-headless,
  dh-exec,
  javahelper,
+ junit5,
  leiningen,
  libasm-java,
  libat-at-clojure (>= 1.2.0),
@@ -74,6 +76,7 @@ Build-Depends:
  libyaml-snake-java <!nocheck>,
  maven-repo-helper,
  postgresql <!nocheck>,
+ postgresql-common-dev <!nocheck>,
  ruby <!nocheck>,
  ruby-puppetserver-ca-cli <!nocheck>,
 Standards-Version: 4.7.2
diff --git a/debian/patches/0001_Lein_Local.patch b/debian/patches/0001_Lein_Local.patch
index ebc04a8..5bcda1a 100644
--- a/debian/patches/0001_Lein_Local.patch
+++ b/debian/patches/0001_Lein_Local.patch
@@ -7,11 +7,9 @@ Forwarded: not-needed
  project.clj | 144 +++++++++++++++++++++++++++++++-----------------------------
  1 file changed, 74 insertions(+), 70 deletions(-)
 
-Index: puppetdb/project.clj
-===================================================================
---- puppetdb.orig/project.clj
-+++ puppetdb/project.clj
-@@ -44,19 +44,19 @@
+--- a/project.clj
++++ b/project.clj
+@@ -44,19 +44,18 @@
  
  (def pdb-dev-deps
    (concat
@@ -33,8 +31,7 @@ Index: puppetdb/project.clj
 +     [org.clojure/test.check "debian"]
 +     [com.gfredericks/test.chuck "debian"]
 +     [riddley "debian"]
-+     [clj-commons/clj-yaml "debian"]
-+     [org.yaml/snakeyaml "1.x"]]))
++     [clj-commons/clj-yaml "debian"]]))
  
       ;; Only needed for :integration tests
 -     [puppetlabs/trapperkeeper-filesystem-watcher nil]]))
@@ -42,7 +39,7 @@ Index: puppetdb/project.clj
  
  ;; Don't use lein :clean-targets so that we don't have to repeat
  ;; ourselves, given that we need to remove some protected files, and
-@@ -120,85 +120,88 @@
+@@ -120,85 +119,88 @@
  
    :min-lein-version "2.7.1"
  
@@ -187,7 +184,7 @@ Index: puppetdb/project.clj
    :lein-release {:scm        :git
                   :deploy-via :lein-deploy}
  
-@@ -234,8 +237,7 @@
+@@ -234,8 +236,7 @@
                          :injections [(do
                                         (require 'schema.core)
                                         (schema.core/set-fn-validation! true))]}
@@ -197,7 +194,7 @@ Index: puppetdb/project.clj
                                :jvm-opts ~(conj pdb-jvm-opts "-XX:-OmitStackTraceInFastThrow")}]
  
               :fips [:defaults
-@@ -333,4 +335,6 @@
+@@ -333,4 +334,6 @@
              "pdb-dataset" ^{:doc (clojure.string/join "" ["Restores an empty database from a pg_dump resulted backup"
                                    " file and shifts all timestamps with the period between the most recent one in"
                                    " the databse and the one you provide, or the current date."])}
diff --git a/debian/patches/series b/debian/patches/series
index 1189c33..18f844e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ skip-failing-networking-testcase.patch
 resolve-ftbfs-with-java-21.patch
 fix-tests-for-psql17.patch
 regen_certs_script.patch
+skip-failing-command-tests.patch
diff --git a/debian/patches/skip-failing-command-tests.patch b/debian/patches/skip-failing-command-tests.patch
new file mode 100644
index 0000000..23d25e9
--- /dev/null
+++ b/debian/patches/skip-failing-command-tests.patch
@@ -0,0 +1,38 @@
+Description: Skip failing command tests
+  Three sub-tests from command_tests.clj fail with libpostgresql-jdbc-java
+  versions 42.7.7-1 and later. This failure is also reported with the upstream 
+  postgresql jdbc project in https://github.com/pgjdbc/pgjdbc/issues/3757. This
+  patch skips the failing tests.
+Author: Pushkar Kulkarni <[e-mail]>
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/1109417
+
+--- a/test/puppetlabs/puppetdb/command_test.clj
++++ b/test/puppetlabs/puppetdb/command_test.clj
+@@ -1296,7 +1296,7 @@
+       ;; PDB_TEST_ALWAYS_BROADCAST_COMMANDS case).
+       :else (pg-serialization-failure-ex? (first (.getSuppressed ex))))))
+ 
+-(deftest concurrent-fact-updates
++(deftest ^:skipped concurrent-fact-updates
+   (testing "Should allow only one replace facts update for a given cert at a time"
+     (with-message-handler {:keys [handle-message _dlo _delay-pool q command-chan]}
+       (let [certname "some_certname"
+@@ -1351,7 +1351,7 @@
+             (is (true? @first-message?))
+             (is (true? @second-message?))))))))
+ 
+-(deftest concurrent-catalog-updates
++(deftest ^:skipped concurrent-catalog-updates
+   (testing "Should allow only one replace catalogs update for a given cert at a time"
+     (with-message-handler {:keys [handle-message command-chan dlo _delay-pool q]}
+       (let [{certname :certname :as wire-catalog} (get-in wire-catalogs [6 :empty])
+@@ -1394,7 +1394,7 @@
+             (is (true? @first-message?))
+             (is (true? @second-message?))))))))
+ 
+-(deftest concurrent-catalog-resource-updates
++(deftest ^:skipped concurrent-catalog-resource-updates
+   (testing "Should allow only one replace catalogs update for a given cert at a time"
+     (with-message-handler {:keys [handle-message command-chan dlo _delay-pool q]}
+       (let [{certname :certname :as wire-catalog} (get-in wire-catalogs [6 :empty])
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