Bastien Roucariès pushed to branch bullseye at Debian Java Maintainers /
ca-certificates-java
Commits:
a4eae99e by Bastien Roucariès at 2025-08-01T20:53:04+02:00
Fix autopkgtest
- - - - -
4 changed files:
- debian/tests/can-convert-keystore
- debian/tests/can-install-jre
- debian/tests/can-install-multiple-jdks
- debian/tests/control
Changes:
=====================================
debian/tests/can-convert-keystore
=====================================
@@ -17,7 +17,7 @@ touch
/var/lib/ca-certificates-java/convert_pkcs12_keystore_to_jks
# THEN conversion is successful
output=`mktemp`
-apt-get install -y openjdk-8-jre-headless | tee ${output}
+apt-get install -y default-jre-headless | tee ${output}
if [[ $(grep -L "Entry for alias amazon successfully imported." ${output}) ]];
then
=====================================
debian/tests/can-install-jre
=====================================
@@ -2,7 +2,7 @@
set -e
-versions=$(apt-cache search jre-headless | awk '{print $1}')
+versions=$(apt-cache -n search jre-headless | awk '{print $1}')
for version in ${versions}
do
# WHEN openjdk-jre-headless package is installed from scratch
=====================================
debian/tests/can-install-multiple-jdks
=====================================
@@ -3,8 +3,12 @@
set -e
output=`mktemp`
+
+jdks=$(apt-cache -n search java-sdk| awk '$1 ~ /-.*-jdk$/ {print $1}')
+
# WHEN multiple JDKs are installed
-apt-get install -y openjdk-11-jdk openjdk-17-jdk openjdk-8-jdk | tee ${output}
+echo "Installing $jdks ..."
+apt-get install -y $jdks | tee ${output}
# THEN installation is successful
if [[ $(grep -L "Adding debian:Amazon_Root_CA_1.pem" ${output}) ]]; then
=====================================
debian/tests/control
=====================================
@@ -6,4 +6,3 @@ Tests: can-install-jre, can-install-multiple-jdks,
can-install-libreoffice
# No depends, this is a test for a clean install
Depends: apt-utils, bash
Restrictions: needs-root
-
View it on GitLab:
https://salsa.debian.org/java-team/ca-certificates-java/-/commit/a4eae99edaf386b60c520c492d99bb801b0a6361
--
View it on GitLab:
https://salsa.debian.org/java-team/ca-certificates-java/-/commit/a4eae99edaf386b60c520c492d99bb801b0a6361
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
