Skip to content

Commit 637afa6

Browse files
committed
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. The test is temporarily disabled. The test will be started when the stable release happaned. Signed-off-by: Ying-Chun Liu (PaulLiu) <[email protected]>
1 parent 86252ee commit 637afa6

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,15 @@ jobs:
280280
run: |
281281
sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'ulimit -a'
282282
test $(sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'ulimit -n') -ge 2048
283+
- name: Check iptables points to iptables-legacy
284+
run: |
283285
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"
286+
- name: Test Java version
287+
run: |
288+
#sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'java --version'
289+
#JAVA_VERSION=$(sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" vsoc-01@localhost 'java -version 2>&1' | sed -n ';s/.* version "\([^"]*\)".*/\1/p;')
290+
JAVA_REQUIRED_VERSION="21.0"
291+
#test "$(printf '%s\n%s' "${JAVA_REQUIRED_VERSION}" "${JAVA_VERSION}" | sort -V | head -n1)" = "${JAVA_REQUIRED_VERSION}"
284292
- name: Shutdown qemu
285293
run: |
286294
sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'echo cuttlefish | sudo -S -k shutdown -h 1'

cuttlefish-integration-gigabyte-arm64/debian/control

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ Homepage: https://github.com/google/android-cuttlefish
1414
Package: cuttlefish-integration-gigabyte-arm64
1515
Architecture: any
1616
Multi-Arch: foreign
17-
Depends: dkms,
17+
Depends: default-jdk (>= 2:1.21),
18+
dkms,
1819
libc6-dev,
1920
libglvnd-dev,
2021
lzop,
2122
ntpsec,
23+
openjdk-25-jdk,
2224
pkgconf,
2325
${misc:Depends},
2426
${shlibs:Depends}

0 commit comments

Comments
 (0)