From cc70943063b44fab5cdd3733be7d716bb820a2bc Mon Sep 17 00:00:00 2001 From: "Ying-Chun Liu (PaulLiu)" Date: Tue, 10 Mar 2026 22:58:04 +0000 Subject: [PATCH] cuttlefish-integration-gigabyte-arm64: install openjdk by default We've already migrate Gigabyte Ampere server installer to Trixie. Thus we can install openjdk-21 from the repo. Install it by default. We also add modify the tests to check that the openjdk is installed and is the version we want. Signed-off-by: Ying-Chun Liu (PaulLiu) --- .github/workflows/gigabyte-ampere-cuttlefish-installer.yaml | 6 ++++++ cuttlefish-integration-gigabyte-arm64/debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml b/.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml index 395eb9c02e9..776ebd6576b 100644 --- a/.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml +++ b/.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml @@ -279,7 +279,13 @@ jobs: run: | sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'ulimit -a' test $(sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'ulimit -n') -ge 2048 + - name: Check iptables points to iptables-legacy + run: | sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'update-alternatives --display iptables' | grep "link currently points to /usr/sbin/iptables-legacy" + - name: Test Java version + run: | + sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'java --version' + sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'java --version' | grep 21.0 - name: Shutdown qemu run: | sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'echo cuttlefish | sudo -S -k shutdown -h 1' diff --git a/cuttlefish-integration-gigabyte-arm64/debian/control b/cuttlefish-integration-gigabyte-arm64/debian/control index c807132a448..d4d23158b2c 100644 --- a/cuttlefish-integration-gigabyte-arm64/debian/control +++ b/cuttlefish-integration-gigabyte-arm64/debian/control @@ -14,7 +14,8 @@ Homepage: https://github.com/google/android-cuttlefish Package: cuttlefish-integration-gigabyte-arm64 Architecture: any Multi-Arch: foreign -Depends: dkms, +Depends: default-jdk, + dkms, libc6-dev, libglvnd-dev, lzop,