[Git][java-team/ca-certificates-java][master] debian/tests: Avoid depending on gpg or keyserver access

[Bastien Roucariès (@rouca)]

Bastien Roucariès pushed to branch master at Debian Java Maintainers / ca-certificates-java


Commits:
4bb1fb45 by Daniel Kahn Gillmor at 2025-08-01T19:03:24+00:00
debian/tests: Avoid depending on gpg or keyserver access

The debian-archive-keyring package already contains the OpenPGP
certificates this test is looking for.

- - - - -


2 changed files:

- debian/tests/can-configure-cross-compilation
- debian/tests/control


Changes:

=====================================
debian/tests/can-configure-cross-compilation
=====================================
@@ -6,10 +6,6 @@ if [ $(dpkg --print-architecture) != 'amd64' ]; then
     exit 0
 fi
 
-gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9
-gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 6ED0E7B82643E131
-gpg --output unstable.pgp --export 6ED0E7B82643E131 0E98404D386FA1D9
-
 echo "Host architecture ${host_arch}"
 echo "Foreign architecture ${foreign_arch}"
 
@@ -39,7 +35,8 @@ apt-ftparchive \
 popd
 
 mmdebstrap  --setup-hook='copy-in /tmp/binaries /tmp' \
-            --keyring unstable.pgp \
+            --keyring /usr/share/keyrings/debian-archive-bullseye-automatic.gpg \
+            --keyring /usr/share/keyrings/debian-archive-bookworm-automatic.gpg \
             --mode=root \
             --variant=essential \
             --architectures=amd64,armhf \


=====================================
debian/tests/control
=====================================
@@ -9,6 +9,6 @@ Restrictions: needs-root
 
 Tests: can-configure-cross-compilation
 # No depends, this is a test for a clean install
-Depends: apt-utils, bash, mmdebstrap, gpg, moreutils
+Depends: apt-utils, bash, mmdebstrap, debian-archive-keyring, moreutils
 Restrictions: needs-root, allow-stderr
 Architecture: amd64



View it on GitLab: https://salsa.debian.org/java-team/ca-certificates-java/-/commit/4bb1fb455129ebcefd916271500b2121bf8f5cd9

-- 
View it on GitLab: https://salsa.debian.org/java-team/ca-certificates-java/-/commit/4bb1fb455129ebcefd916271500b2121bf8f5cd9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20250801/c76bb238/attachment.htm>