From 7a2a226e8a259599ba490fddbd2d55d0a6a21d33 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Wed, 6 Nov 2024 14:01:45 +0200 Subject: [PATCH] Change Java version to 17 on Linux arm Jenkins needs Java 17 to run agent on VM Task-number: QTQAINFRA-6263 Pick-to: 6.8 Change-Id: Ia2749a4812402df8b11f6388f8e6bc3b995d5e53 Reviewed-by: Toni Saario --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh index 26cc4876..a6ecb6ad 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh @@ -113,7 +113,7 @@ installPackages+=(libcurl4-openssl-dev) installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) -installPackages+=(openjdk-11-jdk) +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index 564f7f28..a87a6e37 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -148,9 +148,7 @@ installPackages+=(libcurl4-openssl-dev) installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) -installPackages+=(openjdk-8-jdk) -#Java 11 for Android -installPackages+=(openjdk-11-jdk) +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev)