diff --git a/coin/provisioning/common/macos/java.sh b/coin/provisioning/common/macos/java.sh index 829b94c6..71d8ded9 100755 --- a/coin/provisioning/common/macos/java.sh +++ b/coin/provisioning/common/macos/java.sh @@ -9,12 +9,12 @@ set -ex source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" echo "Installing Java Development Kit" -version=17.0.12 +version=21.0.9 targetFile=jdk-${version}_macos-x64_bin.dmg -expectedHash="6fba2fbe5d181bd2ef7fd79e0335278c13f611cb" +expectedHash="3df8761bfba8d6a4633ecc92f1eff0a58d79c304" url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac -# url_alt=https://www.oracle.com/java/technologies/downloads/#jdk17-mac +# url_alt=https://download.oracle.com/java/21/archive/jdk-21.0.8_macos-x64_bin.dmg echo "Mounting $targetFile" sudo mkdir -p /Volumes/files diff --git a/coin/provisioning/common/macos/java_arm.sh b/coin/provisioning/common/macos/java_arm.sh index 2957d81a..5c427d42 100755 --- a/coin/provisioning/common/macos/java_arm.sh +++ b/coin/provisioning/common/macos/java_arm.sh @@ -8,10 +8,10 @@ set -ex echo "Installing Java Development Kit" -targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg +targetFile=zulu21.46.19-ca-jdk21.0.9-macosx_aarch64.dmg url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac -# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg +# url_alt=https://cdn.azul.com/zulu/bin/zulu21.46.19-ca-jdk21.0.9-macosx_aarch64.dmg echo "Mounting $targetFile" sudo mkdir -p /Volumes/files @@ -22,12 +22,12 @@ sudo umount /Volumes/files sudo hdiutil attach "/tmp/$targetFile" echo Installing JDK -cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target / +cd /Volumes/Azul\ Zulu\ JDK\ 21.46+19 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 21.pkg -target / echo "Unmounting $targetFile" -sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force +sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 21.46+19 -force echo "Disable auto update" sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false -echo "JDK Version = 17.0.13" >> ~/versions.txt +echo "JDK Version = 21.0.9" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 7eb0d1e9..58f2de22 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -4,31 +4,31 @@ . "$PSScriptRoot\helpers.ps1" # This script will install Java SE -# https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html -$version_major = "17" +# https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html +$version_major = "21" $cpu_arch = Get-CpuArchitecture switch ($cpu_arch) { arm64 { - $version = "17.0.11" + $version = "21.0.9" $arch = "aarch64" - $sha1 = "1c5984a185778ad91498b746e677d84e153d5918" - # Using Microsoft build version of OpenJDK from: https://learn.microsoft.com/en-us/java/openjdk/download - # as there are no available Windows ARM64 versions of JDK from Oracle - $url_official = "https://aka.ms/download-jdk/microsoft-jdk-${version}-windows-${arch}.msi" - $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\microsoft-jdk-${version}-windows-${arch}.msi" - $javaPackage = "C:\Windows\Temp\jdk-$version.msi" + $sha1 = "293cca7b76e3280573061f53dbe41ced527e3b4d" + # Using Microsoft build https://aka.ms/download-jdk/ - no .msi available + $url_official = "https://aka.ms/download-jdk/microsoft-jdk-${version}-windows-${arch}.exe" + $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\microsoft-jdk-${version}-windows-${arch}.exe" + $javaPackage = "C:\Windows\Temp\jdk-$version.exe" # Microsoft installer does not allow to override the installation path using the regular # TARGETDIR or INSTALLDIR properties, so just hardcode the path that it uses - $installdir = "C:\Program Files\Microsoft\jdk-17.0.11.9-hotspot" + $installdir = "C:\Program Files\Microsoft\jdk-$version-hotspot" Break } x64 { - $version = "17.0.10" + $version = "21.0.9" $arch = "x64" - $sha1 = "d573091930076c3ffa9f74273cb41cb5c75c5400" - $url_official = "https://download.oracle.com/java/17/archive/jdk-${version}_windows-${arch}_bin.exe" - $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-$version-windows-$arch.exe" + $sha1 = "b4b10fd43993650053c41f377af37b37a2267b74" + # Downloading from https://aka.ms/download-jdk/microsoft-jdk-21.0.9-windows-x64.exe + $url_official = "https://aka.ms/download-jdk/microsoft-jdk-${version}_windows-${arch}.exe" + $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\microsoft-jdk-$version-windows-$arch.exe" $javaPackage = "C:\Windows\Temp\jdk-$version.exe" $installdir = "C:\Program Files\Java\jdk-$version_major" Break @@ -44,7 +44,7 @@ Download $url_official $url_cache $javaPackage Verify-Checksum $javaPackage $sha1 if ($javaPackage.EndsWith(".exe")) { - Run-Executable "$javaPackage" "/s SPONSORS=0" + Run-Executable "$javaPackage" "/SILENT /SUPPRESSMSGBOXES /ALLUSERS /DIR=`"$installdir`"" } else { Run-Executable "msiexec" "/quiet /i $javaPackage" } diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index 8fedd822..ce8b2dae 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -90,7 +90,7 @@ installPackages+=(nss-devel) installPackages+=(libatomic) installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64) # For Android builds -installPackages+=(java-17-openjdk-devel-17.0.9.0.9) +installPackages+=(java-21-openjdk-devel-21.0.9.0.10-1.el9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh index 7f33493b..ba6dee10 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh @@ -71,7 +71,7 @@ installPackages+=(nspr-devel) installPackages+=(nss-devel) installPackages+=(python3-html5lib) # For Android builds -installPackages+=(java-11-openjdk-devel) +installPackages+=(java-21-openjdk-devel) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index 9ba239bf..77d24d1f 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -81,7 +81,7 @@ installPackages+=(nss-devel) installPackages+=(python3-html5lib) installPackages+=(mesa-libgbm-devel) # For Android builds -installPackages+=(java-11-openjdk-devel) +installPackages+=(java-21-openjdk-devel) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh index 59478dc2..252ea688 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh @@ -90,7 +90,7 @@ installPackages+=(nspr-devel) installPackages+=(nss-devel) installPackages+=(python3-html5lib) # For Android builds -installPackages+=(java-11-openjdk-devel-11.0.19.0.7) +installPackages+=(java-21-openjdk-devel) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 52b161c4..53d19d60 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -91,7 +91,7 @@ installPackages+=(python3-html5lib) installPackages+=(libatomic) installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64) # For Android builds -installPackages+=(java-17-openjdk-devel-17.0.9.0.9) +installPackages+=(java-21-openjdk-devel-21.0.9.0.10-1.el9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh index 8a7a6cb7..d778be1d 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh @@ -83,7 +83,7 @@ installPackages+=(python3-html5lib) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9) installPackages+=(libstdc++-static) # For Android builds -installPackages+=(java-17-openjdk-devel-17.0.9.0.9) +installPackages+=(java-21-openjdk-devel-21.0.9.0.10-1.el9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index cc917f60..8783b9c5 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -100,7 +100,7 @@ installPackages+=(python3-html5lib) installPackages+=(libstdc++-static) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9.x86_64) # For Android builds -installPackages+=(java-17-openjdk-devel-17.0.9.0.9) +installPackages+=(java-21-openjdk-devel-21.0.9.0.10-1.el9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh index 9fcbb9ce..3c28518c 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh @@ -100,7 +100,7 @@ installPackages+=(python3-html5lib) installPackages+=(libstdc++-static) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9.x86_64) # For Android builds -installPackages+=(java-17-openjdk-devel-17.0.9.0.9) +installPackages+=(java-21-openjdk-devel-21.0.9.0.10-1.el9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh index b4cab15b..a7a55920 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh @@ -101,7 +101,7 @@ installPackages+=(libstdc++-static) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9.x86_64) installPackages+=(libatomic) # For Android builds -installPackages+=(java-17-openjdk-devel-17.0.9.0.9) +installPackages+=(java-21-openjdk-devel-21.0.9.0.10-1.el9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh index 55a50445..0c22d6e6 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh @@ -86,7 +86,7 @@ sudo zypper -nq install unixODBC-devel unixODBC sudo zypper -nq install sqlite3 sqlite3-devel # Java - needed by RTA jenkins -sudo zypper -nq install java java-17-openjdk-devel +sudo zypper -nq install java java-21-openjdk-devel-21.0.9.0-150600.3.18.2 # open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot. sudo zypper -nq update open-vm-tools 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 ebb82006..bebf7115 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 @@ -136,9 +136,8 @@ installPackages+=(libcurl4-openssl-dev) installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) -installPackages+=(openjdk-8-jdk) -#Java 17 for Android -installPackages+=(openjdk-17-jdk) +#Java 21 for Android +installPackages+=(openjdk-21-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 84035e75..2de51534 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 @@ -142,9 +142,8 @@ installPackages+=(libcurl4-openssl-dev) installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) -installPackages+=(openjdk-8-jdk) -#Java 17 for Android, needed by RTA -installPackages+=(openjdk-17-jdk) +#Java 21 for Android +installPackages+=(openjdk-21-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 48f10d83..d43281cb 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 @@ -149,7 +149,7 @@ installPackages+=(libcurl4-openssl-dev) installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) -installPackages+=(openjdk-17-jdk) +installPackages+=(openjdk-21-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh index 017ec208..314a8141 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -150,10 +150,7 @@ installPackages+=(libcurl4-openssl-dev) installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) -installPackages+=(openjdk-8-jdk) -#Java 17 for Android, needed by RTA -installPackages+=(openjdk-17-jdk) -# Java 21 for QtBridges +#Java 21 for Android installPackages+=(openjdk-21-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) 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 ff9a9b25..6cb7d10a 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 @@ -67,7 +67,7 @@ sudo zypper -nq install make sudo zypper -nq install autoconf libcurl-devel libexpat-devel # Java -sudo zypper -nq install java-17-openjdk +sudo zypper -nq install java-21-openjdk-devel-21.0.9.0-150600.3.18.2 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" 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 c1ca4c45..cc1b6881 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 @@ -73,7 +73,7 @@ sudo zypper -nq install openssl-3 sudo zypper -nq install valgrind-devel # Java -sudo zypper -nq install java-17-openjdk +sudo zypper -nq install java-21-openjdk-devel-21.0.9.0-150600.3.18.2 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" 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 bab5ca55..d1432c93 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 @@ -86,7 +86,7 @@ sudo zypper -nq install cifs-utils sudo zypper -nq install libtommath-devel # Java -sudo zypper -nq install java-17-openjdk +sudo zypper -nq install java-21-openjdk-devel-21.0.9.0-150600.3.18.2 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh index 5512527f..3d3a0004 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh @@ -82,7 +82,7 @@ sudo zypper -nq install cifs-utils sudo zypper -nq install libtommath-devel # Java -sudo zypper -nq install java-17-openjdk java-17-openjdk-devel +sudo zypper -nq install java-21-openjdk-devel-21.0.9.0-150600.3.18.2 # For tst_license.pl with all the machines generating SBOM sudo zypper -nq install perl-JSON diff --git a/coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/04-zypperpackages.sh index 7d0bbdbc..beb2c869 100644 --- a/coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/04-zypperpackages.sh @@ -12,7 +12,7 @@ sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-15 1 # Make sure needed ca-certificates are available sudo zypper -nq install ca-certificates -sudo zypper -nq install bison flex gperf \ +sudo zypper -nq install bison flex gperf libgio-2_0-0=2.84.4\ zlib-devel \ systemd-devel \ glib2-devel \ @@ -82,7 +82,7 @@ sudo zypper -nq install cifs-utils sudo zypper -nq install libtommath-devel # Java -sudo zypper -nq install java-17-openjdk +sudo zypper -nq install java-21-openjdk-devel-21.0.9.0-160000.1.1 # For tst_license.pl with all the machines generating SBOM sudo zypper -nq install perl-JSON