From 8e921c3ad6cdda02ebecfbe04dd7a150945a44ab Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Thu, 14 Nov 2024 09:47:39 +0200 Subject: [PATCH] Update Java in Linux targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Jenkins needs Java 17 Task-number: QTQAINFRA-6263 Change-Id: Ia6438ecadbf98dc2c27e4efc863133ab5bbb668c Reviewed-by: Jukka Jokiniva Reviewed-by: Juho Lääkkö --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 4 ++-- coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 4 ++-- .../qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh | 3 +++ .../qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh | 3 +++ .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 2 ++ 6 files changed, 13 insertions(+), 5 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 ac46389e..3ae69ebd 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 @@ -111,7 +111,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-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index e3c558f5..01f6e79e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -137,8 +137,8 @@ installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) installPackages+=(openjdk-8-jdk) -#Java 11 for Android -installPackages+=(openjdk-11-jdk) +#Java 17 for Android +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index 3cc6e53b..a627d916 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -139,8 +139,8 @@ installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) installPackages+=(openjdk-8-jdk) -#Java 11 for Android -installPackages+=(openjdk-11-jdk) +#Java 17 for Android, needed by RTA +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh index 49d2333d..25bea45b 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh @@ -66,6 +66,9 @@ sudo zypper -nq install make # Tools to build Git sudo zypper -nq install autoconf libcurl-devel libexpat-devel +# Java +sudo zypper -nq install java-17-openjdk + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh index f55387b4..5ee179e3 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh @@ -72,6 +72,9 @@ sudo zypper -nq install openssl-3 # Valgrind (Needed for testlib selftests) sudo zypper -nq install valgrind-devel +# Java +sudo zypper -nq install java-17-openjdk + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh index fa248e25..b9b6bff4 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh @@ -72,6 +72,8 @@ sudo zypper -nq install valgrind-devel # cifs-utils, for mounting smb drive sudo zypper -nq install cifs-utils +# Java +sudo zypper -nq install java-17-openjdk gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt