From dbb4ca8e26a606ab9880e83bf21da0270370bc0d Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Tue, 12 Nov 2024 09:03:19 +0200 Subject: [PATCH] Add Java 17 into OpenSuSE 15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA Jenkins needs this Task-number: QTQAINFRA-6263 Pick-to: 6.5 6.8 Change-Id: Ied9465f1c5542f77e327e3e515ed2b831e606569 Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält Reviewed-by: Aku Pietikäinen Reviewed-by: Johanna Äijälä --- .../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 | 3 +++ 3 files changed, 9 insertions(+) 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 eedb62a5..a146b306 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 @@ -82,6 +82,9 @@ sudo zypper -nq install cifs-utils # For Firebird in RTA sudo zypper -nq install libtommath-devel +# Java +sudo zypper -nq install java-17-openjdk + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt