diff options
author | Marianne Yrjänä <marianne.yrjana@qt.io> | 2020-11-27 17:18:06 +0200 |
---|---|---|
committer | Marianne Yrjänä <marianne.yrjana@qt.io> | 2021-03-16 13:42:45 +0000 |
commit | bb51a640036cb59ecd91e912589c90f89a8e04a8 (patch) | |
tree | 2c047cc8b2ce2b046e124a615219210541a843ae | |
parent | d6eb043bb97dc1c6ac1d6635c31399bda39a95c4 (diff) |
Add QNX7.1 to CI
Task-number: QTQAINFRA-3768
Change-Id: I9c0aa78fad9c6a1263e75b06fa954c335f4b6ec2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 036729ed058deb77f977672d53953f4ad85f7141)
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 33 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/qnx_710.sh (renamed from coin/provisioning/common/linux/qnx_700.sh) | 54 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_710.sh (renamed from coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx710.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx700.sh) | 4 |
4 files changed, 75 insertions, 20 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index fab60021..1b525464 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -137,3 +137,36 @@ Configurations: Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] +- + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Target os: 'QNX_710' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'QCC' + Platform dependency: 'Ubuntu-20.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests', 'Insignificant'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Target os: 'QNX_710' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'QCC' + Platform dependency: 'Ubuntu-20.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests', 'Insignificant'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Target os: 'QNX_710' + Target arch: 'armv7' + Compiler: 'GCC' + Target compiler: 'QCC' + Platform dependency: 'Ubuntu-20.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests', 'Insignificant'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_710.sh index f344c275..fef7cffc 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_710.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,31 +37,53 @@ set -ex +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +DownloadAndExtract () { + url=$1 + sha=$2 + file=$3 + folder=$4 + + DownloadURL "$url" "$url" "$sha" "$file" + sudo tar -C $folder -Jxf $file + + rm -rf $file +} + targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz" -sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1" -folderName="qnx700" -targetFile="qnx700.tar.xz" -wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" -echo "$sha1 $targetFile" | sha1sum --check +folderName="qnx710" +targetPath="$targetFolder$folderName" + if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder fi -sudo tar -C $targetFolder -Jxf $targetFile -sudo chown -R qt:users "$targetFolder"/"$folderName" -# Verify that we have last file in tar -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - echo "Installation failed!" +# QNX SDP +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20201027-linux.tar.xz" +targetFile="qnx710.tar.xz" +sha1="fa9eb0f4247504a546cb014784646847eb6c8114" +DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder" + +# Toolchain files +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx-toolchains.tar.xz" +targetFile="qnx-toolchains.tar.xz" +sha1="d8a97605d80a2296f98caba3854557ca0dd5d7d3" +DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath" + +sudo chown -R qt:users "$targetPath" + +# Verify that we have last files in tars +if [ ! -f $targetPath/qnxsdp-env.sh ] || [ ! -f $targetPath/qnx-toolchain-x8664.cmake ] +then + echo "QNX toolchain installation failed!" exit -1 fi -rm -rf $targetFile - # Set env variables -SetEnvVar "QNX_700" "$targetFolder$folderName" +SetEnvVar "QNX_710" "$targetPath" -echo "QNX SDP = 7.0.0" >> ~/versions.txt +echo "QNX SDP = 7.1.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_710.sh index 92c741fb..4519dd14 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_710.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,4 +36,4 @@ set -ex # shellcheck source=../common/linux/qnx_700.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" +source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx710.sh index 1d7a3968..b1629013 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx710.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the test suite of the Qt Toolkit. @@ -36,4 +36,4 @@ set -ex # shellcheck source=../common/linux/qnx_700.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" +source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh" |