From 689eab5c35ae8ad7e424a37b880ff804ab84c36f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Oct 2019 23:31:10 +0200 Subject: [PATCH 01/24] Update submodules on '5.13' in qt/qt5 Change-Id: I47edb51a61cc8b9e7d7e4ec9ff1c9057e9d126fc Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index c40cccb0..851b2189 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c40cccb0b4485045db61c2d4e825e33a68c58861 +Subproject commit 851b2189a8d31b9306f696c38988bbc554fa9e0c diff --git a/qtbase b/qtbase index 46201f0e..5aa13ea1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 46201f0e82a7b1629adad196dfa8f7ff1cf4dffd +Subproject commit 5aa13ea144cff4dbadf12c08b7aa49646347e186 diff --git a/qtdeclarative b/qtdeclarative index a0ad2cbd..d0e88f82 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a0ad2cbdf27d0d23727b09609e127ac17e414a22 +Subproject commit d0e88f82e07d7a29572d51cecf950d3844408056 diff --git a/qtdoc b/qtdoc index b5298436..ee8b55cc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b52984369df0ba311a7f7106086d30a799e3bb61 +Subproject commit ee8b55cc0e5699c73bad500c12dbe62fe057398b diff --git a/qtmultimedia b/qtmultimedia index 545959e4..c7bd3131 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 545959e45ec86c70617f4839d20d931297c30c20 +Subproject commit c7bd3131a8854814d59881339ac1d7a4af3c9863 diff --git a/qtnetworkauth b/qtnetworkauth index 202c7d89..b82a17d8 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 202c7d893f14e65fbb89e9cf7b37a3502bf923ec +Subproject commit b82a17d8ed996a8f2ff5902fdd229f3b68712c1d diff --git a/qtqa b/qtqa index e50ae95c..0ff3b75d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e50ae95cdfd5a4967708b99ad7ff803f62cd623a +Subproject commit 0ff3b75dd8287b42f9748f3f9479001931057e87 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 83fbf44b..788865b8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 83fbf44b980c4a072ede122f2f16921bfff8c08d +Subproject commit 788865b805bc91151ac8fe18bf7b92b1212ee07d diff --git a/qttools b/qttools index c8e79294..303d26c6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c8e79294237260d735324663932a676d8084efcb +Subproject commit 303d26c6d1c5e87e2e0d1f0032b28a6a50edee03 From 37b2f54919bcbaf2535048ee37094025d3768bda Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 5 Oct 2019 23:30:53 +0200 Subject: [PATCH 02/24] Update submodules on '5.13' in qt/qt5 Change-Id: I1e4a3f0a9ec8280b5a6801096f283435c1f0f855 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtqa | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 851b2189..21c87018 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 851b2189a8d31b9306f696c38988bbc554fa9e0c +Subproject commit 21c87018a093a361d92f573bc1b4cb96ed1e1160 diff --git a/qtbase b/qtbase index 5aa13ea1..425c5978 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5aa13ea144cff4dbadf12c08b7aa49646347e186 +Subproject commit 425c59783c960e9f568b6c5e8920774ada9b87e5 diff --git a/qtqa b/qtqa index 0ff3b75d..075ed07c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0ff3b75dd8287b42f9748f3f9479001931057e87 +Subproject commit 075ed07cbaef3da2be5a2f75739020f5ed15f893 diff --git a/qtwayland b/qtwayland index 1ed0782e..277de587 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1ed0782e93dafb0a3d5ef3a02c9c3999825817ee +Subproject commit 277de587f956dba2a68eb82b9666063ab12c51c4 From d97d1af1eeb4185e9ae6ce73c3184e5e9834902b Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 2 Oct 2019 19:04:25 +0200 Subject: [PATCH 03/24] Fix provisioning script for RHEL 6 It seems RHEL 6.6 does not provide /etc/os-release. Change-Id: I01ba2bb17b89c01f9991944a11eeaa9c2eba6f20 Reviewed-by: Heikki Halmet --- .../common/unix/common.sourced.sh | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh index a52880b2..7fb267a6 100644 --- a/coin/provisioning/common/unix/common.sourced.sh +++ b/coin/provisioning/common/unix/common.sourced.sh @@ -74,6 +74,25 @@ is_script_executed common.sourced.sh \ && fatal "Script common.sourced.sh should always be sourced, not executed" +_detect_linux_OS_ID () { + if [ -f /etc/os-release ] + then + . /etc/os-release + PROVISIONING_OS_ID="$ID" + elif [ -f /etc/redhat-release ] + then + case "$(cat /etc/redhat-release)" in + "Red Hat Enterprise Linux"*) + PROVISIONING_OS_ID="rhel" + ;; + "CentOS Linux"*) + PROVISIONING_OS_ID="centos" + ;; + *) fatal "Unknown string in /etc/redhat-release" ;; + esac + fi +} + set_common_environment () { # Unfortunately we can't find the provisioning directory from a sourced # script in a portable way @@ -86,8 +105,7 @@ set_common_environment () { case "$uname_s" in Linux) PROVISIONING_OS=linux - . /etc/os-release - PROVISIONING_OS_ID="$ID" + _detect_linux_OS_ID case "$PROVISIONING_OS_ID" in suse|sles|opensuse*) CMD_PKG_INSTALL="sudo zypper -nq install" From 869a9b3ae7135158247113921c2dfc6cbe7ad6ce Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 2 Oct 2019 19:05:15 +0200 Subject: [PATCH 04/24] Fix shell function is_script_executed It used to return error when tested inside a login shell, because $0 is "-bash" and `basename` was trying to interpret -b as an option. Change-Id: I5faa2dc01e50c7d5bcfc0ab1fcfd910b2538afc2 Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/common.sourced.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh index 7fb267a6..aca5dd04 100644 --- a/coin/provisioning/common/unix/common.sourced.sh +++ b/coin/provisioning/common/unix/common.sourced.sh @@ -65,8 +65,10 @@ fatal () { fi } +# Takes one argument which should be the filename of this script. Returns true +# if the script is being sourced, false if the script is being executed. is_script_executed () { - [ x"$(basename "$0")" = x"$1" ] + [ x"$(basename $(echo "$0" | sed s/^-//))" = x"$1" ] } From dd9a3883aa93277c429b83dcaad20a2a9aeb7fab Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 3 Oct 2019 12:44:53 +0200 Subject: [PATCH 05/24] Ensure provisioning works even without the secrets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3869e881341a719da8a351095c3bf314c2fa2f34 Reviewed-by: Mårten Nordheim --- .../common/windows/telegraf_password.ps1 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/telegraf_password.ps1 b/coin/provisioning/common/windows/telegraf_password.ps1 index 11d04dbc..773ec866 100644 --- a/coin/provisioning/common/windows/telegraf_password.ps1 +++ b/coin/provisioning/common/windows/telegraf_password.ps1 @@ -31,9 +31,16 @@ ## ############################################################################# +$auth_file = "C:\Users\qt\work\influxdb\coin_vms_writer.auth" + +# Provisioning should run even without the secrets repository +if (Test-Path $auth_file) { + $auth_content = Get-Content $auth_file + $influxdb_password = $auth_content.Substring($auth_content.LastIndexOf(':') + 1) + Remove-Item $auth_file +} else { + $influxdb_password = "no_password_provided" +} -$colon_file = Get-Content "C:\Users\qt\work\influxdb\coin_vms_writer.auth" -$influxdb_password = $colon_file.Substring($colon_file.LastIndexOf(':') + 1) $telegraf_conf = "C:\telegraf-coin.conf" (Get-Content $telegraf_conf) | ForEach-Object { $_.Replace("COIN_VMS_WRITER_PASS", $influxdb_password) } | Out-File -Encoding UTF8 $telegraf_conf -Remove-Item "C:\Users\qt\work\influxdb\coin_vms_writer.auth" From e4ae752c0d460cb9a8b3166664319f706f1a1b1a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 18 Sep 2019 15:09:52 +0300 Subject: [PATCH 06/24] Provisioning: Make sure that Configure and Make will pass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During powershell process error is not caught and provisioning continues even if the exitcode is something else that '0' Task-number: QTQAINFRA-3214 Change-Id: I91116a78d0c4defe6ba4287913c2394e199be958 Reviewed-by: Tony Sarajärvi Reviewed-by: Mårten Nordheim --- .../common/windows/android-openssl.ps1 | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 981fa51d..c3c3156a 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -65,8 +65,25 @@ Remove-Item -Path $zip Write-Host "Configuring OpenSSL $version for Android..." Push-Location $destination # $ must be escaped in powershell... -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + +function CheckExitCode { + + param ( + $p + ) + + if ($p.ExitCode) { + Write-host "Process failed with exit code: $($p.ExitCode)" + exit 1 + } +} + +$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") +CheckExitCode $configure + +$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") +CheckExitCode $make + Pop-Location Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" From d02f0a913e26aa27f3a6b6f275a24b89a6b4388c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 3 Oct 2019 10:16:15 +0300 Subject: [PATCH 07/24] Provisioning: Hide windows squish installation output from the log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will prevent the output of unwanted information Change-Id: I5f1824a6bbe98c673ef04dc2daa0db0536d27828 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/squishInstall.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index de04d242..2cc45785 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -73,7 +73,9 @@ Function DownloadAndInstallSquish { Write-Host "Fetching from URL $squishUrl" Copy-Item "$SquishUrl" "$SquishInstaller" Write-Host "Installing Squish" - Run-Executable "$SquishInstaller" "$SquishParameters" + $stdoutFile = [System.IO.Path]::GetTempFileName() + $stderrFile = [System.IO.Path]::GetTempFileName() + Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null Remove-Item -Path $SquishInstaller if ("$bit" -eq "win64") { if ($squishPackage.StartsWith("mingw")) { From 3f9673d1090feecd9e849ca2547f3024e323777a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 11 Oct 2019 12:21:58 +0300 Subject: [PATCH 08/24] Provisioning: Update Cmake to version 3.7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtCreator requires Cmake minimal version to be at least 3.7.0 Task-number: QTQAINFRA-3272 Change-Id: Id7f2d38ad0581c1aead4b5bac860ac193488ae1b Reviewed-by: Tony Sarajärvi Reviewed-by: Nikolai Kosjar --- coin/provisioning/common/linux/cmake_linux.sh | 10 +++++----- coin/provisioning/common/windows/cmake.ps1 | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 2b8d71d0..a3b2a9cc 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.6.2 +# This script installs CMake 3.7.2 # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,10 +42,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +version="3.7.2" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.7.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" +SHA1="915bc981aab354821fb9fd28374a720fdb3aa180" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index ec84d706..9d3d6aef 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.6" -$version = "3.6.2" +$majorminorversion = "3.7" +$version = "3.7.2" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" +Verify-Checksum $zip "c80c17e858ecfebfaf16fe8af18b174d2600c4e6" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" From 9ee61892d0ae1ad2fb22b87bd37d63eb1e0ddcc3 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Tue, 4 Jun 2019 14:08:47 +0300 Subject: [PATCH 09/24] Add platform_configurations for StaticHostOnly targets Configuring modules in specific files removes their dependency for coin creating their configurations. Task-number: COIN-259 Task-number: QTBUG-78942 Change-Id: I8f2a9a5672ca2261c8949baf49f2d0d093bf1c5b Reviewed-by: Aapo Keskimolo --- coin/platform_configs/flashing-wizard.yaml | 23 +++++++++++++++ coin/platform_configs/qdb.yaml | 23 +++++++++++++++ coin/platform_configs/tqtc-qt-config-gui.yaml | 28 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 coin/platform_configs/flashing-wizard.yaml create mode 100644 coin/platform_configs/qdb.yaml create mode 100644 coin/platform_configs/tqtc-qt-config-gui.yaml diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml new file mode 100644 index 00000000..f0f0e51d --- /dev/null +++ b/coin/platform_configs/flashing-wizard.yaml @@ -0,0 +1,23 @@ +Version: 2 +Module only: True +Configurations: + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Target arch: 'x86' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' + - + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml new file mode 100644 index 00000000..02198976 --- /dev/null +++ b/coin/platform_configs/qdb.yaml @@ -0,0 +1,23 @@ +Version: 2 +Module only: True +Configurations: + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2015' + Target arch: 'x86' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2015' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' + - + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml new file mode 100644 index 00000000..da37d0e5 --- /dev/null +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -0,0 +1,28 @@ +Version: 2 +Module only: True +Configurations: + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Target arch: 'x86' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' + - + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' + - + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck'] From c6a9b3cd689c2a2691efda37f58e3780bc055e7d Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 10 Oct 2019 19:13:27 +0200 Subject: [PATCH 10/24] Update previously committed patch to match the branch's platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3092 Change-Id: I598759f0624e478a07cfe3256cbeba2f2b8bfe02 Reviewed-by: Tony Sarajärvi --- .../01-install_telegraf.sh | 0 .../qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh | 3 --- .../01-install_telegraf.sh | 0 .../qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh | 3 --- 4 files changed, 6 deletions(-) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/01-install_telegraf.sh (100%) delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh rename coin/provisioning/{qtci-linux-Ubuntu-16.04-x86 => qtci-linux-openSUSE-15.0-x86_64}/01-install_telegraf.sh (100%) delete mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh From 482552d813f78f88c9756433e69abf79ff567330 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 11 Oct 2019 11:16:02 +0200 Subject: [PATCH 11/24] First try cached URL before hitting the official repo Change-Id: Id0cf89090155459fd660d55ce427cd34bf3136f5 Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh index 0a29d842..de566a56 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh @@ -44,7 +44,7 @@ cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package" sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" targetFile="/tmp/$package" -DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" +DownloadURL "$cacheUrl" "$primaryUrl" "$sha1" "$targetFile" sudo yum -y install "$targetFile" rm "$targetFile" From 518e114dc71fb58d175a15afb282ac7f6dff6adc Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 11 Oct 2019 11:30:38 +0200 Subject: [PATCH 12/24] Fix for DownloadURL to try alternative URL Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4 Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/DownloadURL.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 0579451f..ac1fd971 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -99,9 +99,9 @@ DownloadURL () { if ! Download "$url" "$targetFile" then echo "FAIL! to download, trying alternative URL: $url2" 1>&2 - if ! Download "$url" "$targetFile" + if ! Download "$url2" "$targetFile" then - echo 'FAIL! to download even from alternative url' 1>&2 + echo 'FAIL! to download even from alternative URL' 1>&2 return 1 fi fi From 72111504ea60b37e6b8e133e2d6b0d7029eeabec Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 11 Oct 2019 11:31:28 +0200 Subject: [PATCH 13/24] Update epel package to latest version The online repo only contains the latest version. Change-Id: I2dfbc3c2a873ed3758672682b09c0205bfa19549 Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh index de566a56..443bfa9e 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh @@ -38,13 +38,13 @@ set -ex # shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -package="epel-release-7-11.noarch.rpm" +package="epel-release-7-12.noarch.rpm" primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package" cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package" -sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" +sha256="d6bb83c00ab3af26ded56459e7d6fceabfef66efbe0780b4dedbe81d62c07cd5" targetFile="/tmp/$package" -DownloadURL "$cacheUrl" "$primaryUrl" "$sha1" "$targetFile" +DownloadURL "$cacheUrl" "$primaryUrl" "$sha256" "$targetFile" sudo yum -y install "$targetFile" rm "$targetFile" From 2b58935efd12bd649e28149cb64ea021b88f9e2e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 10 Oct 2019 16:43:21 +0300 Subject: [PATCH 14/24] QNX: Use extprefix for the host path Use extprefix instead of prefix, so that the target deployment path won't contain host paths. Especially needed to avoid Windows host paths on target. Prefix will default to /usr/local/Qt-x.x.x Task-number: COIN-48 Change-Id: Ie888dace694294b72a32913b65a191b4bcb78371 Reviewed-by: James McDonnell --- coin/platform_configs/default.yaml | 2 +- coin/platform_configs/qt5.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 55e73038..d19ec84c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -191,4 +191,4 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 208c47ed..1bd4c9da 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -112,42 +112,42 @@ Target arch: 'x86' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' - Template: 'qtci-windows-10-x86_64-14' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' - Template: 'qtci-windows-10-x86_64-14' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' - Template: 'qtci-windows-10-x86_64-14' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' - Template: 'qtci-windows-10-x86_64-14' Target os: 'WebAssembly' From 60befd750829fe5a61b07256f0dc667ea1bd0f2f Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Sep 2019 10:18:38 +0300 Subject: [PATCH 15/24] Provisioning: Disable automatic cleanup from windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3238 Change-Id: Ie64086b650016adb7129bd4c4592ca987cc1453b Reviewed-by: Daniel Smith Reviewed-by: Dimitrios Apostolou Reviewed-by: Tony Sarajärvi --- .../provisioning/common/windows/disable-clean-manager.ps1 | 8 ++++++++ .../qtci-windows-10-x86/00-disable-clean-manager.ps1 | 1 + .../qtci-windows-10-x86_64/00-disable-clean-manager.ps1 | 1 + .../qtci-windows-7-x86/00-disable-clean-manager.ps1 | 1 + 4 files changed, 11 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-clean-manager.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1 diff --git a/coin/provisioning/common/windows/disable-clean-manager.ps1 b/coin/provisioning/common/windows/disable-clean-manager.ps1 new file mode 100644 index 00000000..6d54e137 --- /dev/null +++ b/coin/provisioning/common/windows/disable-clean-manager.ps1 @@ -0,0 +1,8 @@ +# This script will disable automatic disk cleanup + +. "$PSScriptRoot\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F" + +# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space. +DisableSchedulerTask "DiskCleanup\SilentCleanup" diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1 new file mode 100644 index 00000000..1dc08d21 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 new file mode 100644 index 00000000..1dc08d21 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1 new file mode 100644 index 00000000..1dc08d21 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" From 17550319e50ecff255e6a8ec31919ed90b6a1880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 22 Oct 2019 11:34:26 +0000 Subject: [PATCH 16/24] Provision gnuwin32's path By provisioning the path to gnuwin32, we can remove the hard coded paths from Coin. Task-number: QTBUG-73422 Change-Id: Ice96fcd992e22ed39b66496403b9eaa99a6865a0 Reviewed-by: Toni Saario Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install-gnuwin32.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1 index 99862b3c..6acede79 100644 --- a/coin/provisioning/common/windows/install-gnuwin32.ps1 +++ b/coin/provisioning/common/windows/install-gnuwin32.ps1 @@ -44,3 +44,4 @@ Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5" Extract-7Zip "$temp\$zipPackage" C:\Utils Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt +Prepend-Path "C:\Utils\gnuwin32\bin" From eb0ef419ec91ed580b13d54bf480087b7d33c2e1 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 25 Oct 2019 15:20:53 +0300 Subject: [PATCH 17/24] Add allowUntrusted parameter for command line tools and refresh Xcode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple has signed their packages with certificate which has been expired 24.11.2019. Packages are unusable without allowUntrusted parameter Also Xcode package for macOS10.13 needs to be refetched from Apple's download to local cache Task-number: QTQAINFRA-3317 Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/install-commandlinetools.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/macos/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh index b9f81534..cd7838b6 100755 --- a/coin/provisioning/common/macos/install-commandlinetools.sh +++ b/coin/provisioning/common/macos/install-commandlinetools.sh @@ -50,7 +50,7 @@ function InstallCommandLineTools { hdiutil attach "/tmp/$packageName" cd "/Volumes/Command Line Developer Tools" echo "Installing" - sudo installer -pkg ./*.pkg -target / + sudo installer -pkg ./*.pkg -target / -allowUntrusted cd / # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted sleep 3 diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh index 1ab68fec..510ce59b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1.tar.gz 10.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1_updated.tar.gz 10.1 From 5b77e74a5e66be1b0b529ad872d2d80457ef4a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 30 Oct 2019 09:30:46 +0000 Subject: [PATCH 18/24] Change local Ubuntu repo mirror in provisioning The old mirror host Qt company used to sync their local mirror from, stopped syncing from Ubuntu in October 2018. The mirror mechanism was changed so that in the future if addresses change, we don't have to touch the provisioning scripts as the address is more general. Also a duplicate entry was removed. Task-number: QTQAINFRA-3279 Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6 Reviewed-by: Heikki Halmet --- .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 280e6b45..e7cf5c3d 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -47,11 +47,10 @@ done function set_internal_repo { sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-updates main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-backports main restricted universe - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-security main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse EOC } From 2eab420e807d5fa4e39d4437879b9a35a2cdc88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 31 Oct 2019 13:32:28 +0000 Subject: [PATCH 19/24] Remove more of update notifiers Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911 Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/remove-update_notifier.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/remove-update_notifier.sh b/coin/provisioning/common/linux/remove-update_notifier.sh index 152d7fa8..4ee32d61 100755 --- a/coin/provisioning/common/linux/remove-update_notifier.sh +++ b/coin/provisioning/common/linux/remove-update_notifier.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -sudo apt -q -y remove update-notifier update-manager +sudo apt -q -y remove update-notifier update-manager python3-distupgrade python3-update-manager ubuntu-release-upgrader-core update-manager-core From 5b752460bc37ce298c332d7b1d500242068d66e6 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 31 Oct 2019 14:43:04 +0200 Subject: [PATCH 20/24] Provisioning: Update Xcode package for macOS 10.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple's certification was expired so Xcode 10.2.1 package needs to be updated from the Apple's download server. Old one causing problems with RTA tests. Task-number: QTQAINFRA-3317 Change-Id: I5006f95ab420e26523d2621800d80322a52bb9a2 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh index ebeadc02..2ee4dedf 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1.tar.gz 10.2.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1 From 52fe759ebacd4d58945f0dd01b3aecf321e20375 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 18 Sep 2019 13:43:22 +0300 Subject: [PATCH 21/24] Provisioning: Upgrade OpenSSL version to 1.1.1d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plus removing unused file install_openssl_111a.sh Task-number: QTQAINFRA-3224 Change-Id: If5f9ee12e118e0329eb27f8d3ca9829011874382 Reviewed-by: Tony Sarajärvi --- .../common/linux/openssl_for_android_linux.sh | 4 +- .../common/macos/install_openssl_111a.sh | 78 ------------------- .../common/unix/install-openssl.sh | 4 +- .../common/windows/android-openssl.ps1 | 4 +- coin/provisioning/common/windows/openssl.ps1 | 6 +- .../qtci-macos-10.14-x86_64/35-openssl.sh | 5 +- 6 files changed, 12 insertions(+), 89 deletions(-) delete mode 100755 coin/provisioning/common/macos/install_openssl_111a.sh diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index d833975f..4860c01f 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -53,11 +53,11 @@ else rm -rf "$exports_file" fi -version="1.1.1b" +version="1.1.1d" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +sha="056057782325134b76d1931c48f2c7e6595d7ef4" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" diff --git a/coin/provisioning/common/macos/install_openssl_111a.sh b/coin/provisioning/common/macos/install_openssl_111a.sh deleted file mode 100755 index cd6cd9e8..00000000 --- a/coin/provisioning/common/macos/install_openssl_111a.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install OpenSSL - -set -ex - -# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -opensslVersion="1.1.1a" -opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" -opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="8fae27b4f34445a5500c9dc50ae66b4d6472ce29" - -# Below target location has been hard coded into Coin. -# QTQAINFRA-1195 -openssl_install_dir=/usr/local/openssl-$opensslVersion -opensslTargetLocation="/usr/local/opt/openssl" - -InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" -cd "/tmp/openssl-$opensslVersion" -sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack" - -sudo make install_sw install_ssldirs - -path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') -sudo mkdir -p "$path" -sudo ln -s $openssl_install_dir $opensslTargetLocation - -SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" -SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" - -SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" -SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" -SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" - -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null - -sudo rm -rf /tmp/openssl-$opensslVersion - -echo "OpenSSL = $opensslVersion" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 01a20935..08a3390b 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1b" +version="1.1.1d" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +sha="056057782325134b76d1931c48f2c7e6595d7ef4" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index c3c3156a..e4306584 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -45,9 +45,9 @@ if (Is64BitWinHost) { # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.1.1b" +$version = "1.1.1d" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102" +$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4" $destination = "C:\Utils\openssl-android-master" # msys unix style paths diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 2f21db37..891f5db7 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_1_1b" +$version = "1_1_1d" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "5b50819dd84aa9219e0cad9cdddf78285bdd1bbb" + $sha1 = "df9c40e9e82edf693c15302cbc8e8a057857a13c" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "1ae5ad4fe5dae01dd056274979cce26945c9e86c" +$sha1 = "5c49ccd3a5d17f63d25fb819963978f50c7966d0" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh index cf312ed2..57a86c47 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh @@ -2,5 +2,6 @@ set -ex -# shellcheck source=../common/macos/install_openssl_111a.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl_111a.sh" +# shellcheck source=../common/macos/install_openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" + From 8bdabd9901af3ccf5632096c1a5fafd54ac124c8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 17 Oct 2019 13:07:11 +0300 Subject: [PATCH 22/24] Provisioning: Remove Red Hat 6.6 from provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3260 Change-Id: If6078a36e9ab7730cacb81a9c417c87455db89cd Reviewed-by: Eike Ziller Reviewed-by: Dimitrios Apostolou Reviewed-by: Tony Sarajärvi --- .../01-disable-mlocate.sh | 4 - .../01-install_telegraf.sh | 3 - .../01-refresh-subscription-manager.sh | 43 ----------- .../01-systemsetup.sh | 46 ------------ .../02-disable-ntp.sh | 4 - .../03-install-rhel-epel.sh | 48 ------------ .../04-install-packages.sh | 46 ------------ .../05-subscription-manager-tooling.sh | 10 --- .../qtci-linux-RHEL-6.6-x86_64/06-odbc.sh | 8 -- .../08-pythondev.sh | 51 ------------- .../qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 4 - .../09-install-openssl.sh | 6 -- .../qtci-linux-RHEL-6.6-x86_64/20-libusb.sh | 6 -- .../22-mqtt_broker.sh | 37 ---------- .../30-install_icu.sh | 74 ------------------- .../qtci-linux-RHEL-6.6-x86_64/99-version.sh | 48 ------------ 16 files changed, 438 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh deleted file mode 100755 index f12cff1e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -# shellcheck source=../common/linux/disable-mlocate.sh -"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh deleted file mode 100755 index 84238ebf..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# refresh local certificates -sudo subscription-manager refresh - -# Attach available subscriptions to system. This is needed when subscriptions are renewed. -sudo subscription-manager attach --auto - diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh deleted file mode 100755 index 0b85f10d..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/unix/check_and_set_proxy.sh -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" - -# shellcheck disable=SC2031 -if [ "$http_proxy" != "" ]; then - echo "proxy=$proxy" | sudo tee -a /etc/yum.conf -fi - -sudo yum update -y nss curl diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh deleted file mode 100755 index 89806892..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-ntp_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh deleted file mode 100755 index 91097dbf..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -package="epel-release-6-8.noarch.rpm" -primaryUrl="https://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/e/$package" -cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel6/$package" -sha1="2b2767a5ae0de30b9c7b840f2e34f5dd9deaf19a" -targetFile="/tmp/$package" - -DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" - -sudo yum -y install "$targetFile" -rm "$targetFile" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh deleted file mode 100755 index c1189a94..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -installPackages=() - -# For Jenkins -installPackages+=(java-1.8.0-openjdk-devel) -# For Qt Creator -installPackages+=(openssl-devel) - -sudo yum -y install "${installPackages[@]}" - diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh deleted file mode 100755 index d3072b37..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -# provides: fix for possible bug in the subscription manager -# version: provided by RedHat -# needed for yum to work properly in case there is incorrect data in -# the sslclientkey repository parameter value - -set -ex - -sudo rm -f /etc/pki/entitlement/* -sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh deleted file mode 100755 index c8edc2a2..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# provides: odbc devel packages on RHEL -# version: provided by default Linux distribution repository -# needed for configure -plugin-sql-odbc in qtbase - -set -ex - -sudo yum install -y unixODBC-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh deleted file mode 100755 index 2861821c..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside - -set -ex - -sudo yum install -y python-devel python-virtualenv - -# install python3 -sudo yum install -y python34-devel - -# install pip3 -wget https://bootstrap.pypa.io/get-pip.py -sudo python3 get-pip.py -sudo rm -f get-pip.py -sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh deleted file mode 100755 index 74520b6e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex - -"$(dirname "$0")/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -# shellcheck source=../common/unix/install-openssl.sh -source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh deleted file mode 100755 index b156e8f9..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -# Required for tqtc-boot2qt/qdb - -set -ex - -sudo yum install -y libusb1-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh deleted file mode 100755 index 505374c5..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# shellcheck source=../common/unix/mqtt_broker.sh -source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh deleted file mode 100755 index 67c17954..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs the right ICU version - -set -ex -icuVersion="56.1" -icuLocation="/usr/lib64" -sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753" - -function Install7ZPackageFromURL { - url=$1 - expectedSha1=$2 - targetDirectory=$3 - - targetFile=$(mktemp) - wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" - echo "$expectedSha1 $targetFile" | sha1sum --check - sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile" - rm "$targetFile" -} - -echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" - -baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" -Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64" - -echo "Installing custom ICU devel packages on RHEL" - -sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df" -develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" -tempDir=$(mktemp -d) -# shellcheck disable=SC2064 -trap "sudo rm -fr $tempDir" EXIT -Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir" -sudo cp -a "$tempDir/lib"/* /usr/lib64 -sudo cp -a "$tempDir"/* /usr/ - -sudo /sbin/ldconfig - -# Storage version information to ~/versions.txt, which is used to print version information to provision log. -echo "ICU = $icuVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh deleted file mode 100755 index 1354bf6b..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script needs to be called last during provisioning so that the software information will show up last in provision log. - -# Storage installed RPM packages information - -set -ex - -# shellcheck disable=SC2129 -echo "*********************************************" >> ~/versions.txt -echo "***** All installed RPM packages *****" >> ~/versions.txt -rpm -q -a | sort >> ~/versions.txt -echo "*********************************************" >> ~/versions.txt - -"$(dirname "$0")/../common/linux/version.sh" From 39a42f0abd1cffc634fe5ba91dde893bebc43021 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 2 Oct 2019 14:52:48 +0300 Subject: [PATCH 23/24] Provisioning: Hide password with /dev/null MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic60ba668764c928977c826e02686a0cd341b995f Reviewed-by: Tony Sarajärvi --- .../qtci-macos-10.12-x86_64/05-systemsetup.sh | 13 +++++++++++-- .../qtci-macos-10.13-x86_64/05-systemsetup.sh | 13 +++++++++++-- .../qtci-macos-10.14-x86_64/05-systemsetup.sh | 13 +++++++++++-- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index ce8043fa..95631107 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,7 +37,13 @@ set -ex # This script modified system settings for automated use -VNCPassword=qt +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null NTS_IP=10.212.2.216 echo "Disable Screensaver" @@ -82,10 +88,13 @@ defaults write -g InitialKeyRepeat -int 15 # normal minimum is 2 (30 ms) defaults write -g KeyRepeat -int 2 +set +x echo "Enable remote desktop sharing" sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all +set -x echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT +sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh index d91316bd..95631107 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,7 +37,13 @@ set -ex # This script modified system settings for automated use -VNCPassword=qt +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null NTS_IP=10.212.2.216 echo "Disable Screensaver" @@ -82,10 +88,13 @@ defaults write -g InitialKeyRepeat -int 15 # normal minimum is 2 (30 ms) defaults write -g KeyRepeat -int 2 +set +x echo "Enable remote desktop sharing" sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all +set -x echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT +sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh index 817e3858..79eba834 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,7 +37,13 @@ set -ex # This script modified system settings for automated use -VNCPassword=qt +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null NTS_IP=10.212.2.216 echo "Disable Screensaver" @@ -82,11 +88,14 @@ defaults write -g InitialKeyRepeat -int 15 # normal minimum is 2 (30 ms) defaults write -g KeyRepeat -int 2 +set +x echo "Enable remote desktop sharing" sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all +set -x echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT sudo systemsetup setusingnetworktime off +sudo rm -f "$targetFile" From d690f84fd40beebcb9891df8bb656973daf55b22 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 3 Nov 2019 23:31:08 +0100 Subject: [PATCH 24/24] Update submodules on '5.13' in qt/qt5 Change-Id: Ibe25a3e99d09aea840c9e86a403dc1577701eb0a Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 21c87018..51b09ca0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 21c87018a093a361d92f573bc1b4cb96ed1e1160 +Subproject commit 51b09ca0b2506f3cdfd025511a68888ed959b6d5 diff --git a/qtactiveqt b/qtactiveqt index 5075808e..85441bca 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 5075808ee2e1a644bb85764367b60a31e5dcae94 +Subproject commit 85441bcab7528081e2dae15aaf13ee53789df9ed diff --git a/qtandroidextras b/qtandroidextras index 6586350b..e44b34a2 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 6586350b36a40be682cc351d7963c82c003be82e +Subproject commit e44b34a2f9e21ee96c837b15eb9328940abec7e5 diff --git a/qtbase b/qtbase index 425c5978..39ed657b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 425c59783c960e9f568b6c5e8920774ada9b87e5 +Subproject commit 39ed657b6393c850735857e367303800f1a04413 diff --git a/qtcharts b/qtcharts index 73efdb10..d20e0613 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 73efdb1066dcf5b4690de44f712f3de4d5f1fc18 +Subproject commit d20e0613191fe8678712af45b18130b58b3db5a2 diff --git a/qtconnectivity b/qtconnectivity index 7390de23..35cf49f9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7390de230e3c86049824bef756e4af623a547d61 +Subproject commit 35cf49f9973f96a6afc00269e930291d9edc238b diff --git a/qtdatavis3d b/qtdatavis3d index 1a58c3cf..af4466c7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 1a58c3cffe2190f20aca3d7acbb25a9ff62d6770 +Subproject commit af4466c7af7345a2a92f2523b29e79ce22205003 diff --git a/qtdeclarative b/qtdeclarative index d0e88f82..15d1b173 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d0e88f82e07d7a29572d51cecf950d3844408056 +Subproject commit 15d1b173d030f5ae5ca72f511d33c80979503268 diff --git a/qtdoc b/qtdoc index ee8b55cc..62dbc6b4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ee8b55cc0e5699c73bad500c12dbe62fe057398b +Subproject commit 62dbc6b4a1608bf75c00b90b6da60785c2e8fc89 diff --git a/qtgamepad b/qtgamepad index 324dd701..2d5c3c24 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 324dd701ec755684a2bc5c7e8b2d5413316f2f53 +Subproject commit 2d5c3c24925bf96f48789fbc0e1b78371ba1170e diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3cac429c..90225997 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3cac429c9bf0bc43f281aa12cb121bece608cb37 +Subproject commit 90225997832fe6b3eec1f2dfba3bff40ed8a73bd diff --git a/qtimageformats b/qtimageformats index cd646ff7..9fe1f2e9 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit cd646ff7e1990ddcd5438767fa7093131734c171 +Subproject commit 9fe1f2e918d39031852805f1add23125c061d3c3 diff --git a/qtlocation b/qtlocation index 118dac89..c1dd5c29 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 118dac89625a8f713bb12e7e9f30bc37b10754b7 +Subproject commit c1dd5c2979e1558427536fe2435ff3892afe3e6f diff --git a/qtlottie b/qtlottie index b6b7fa35..2c681d20 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit b6b7fa3596d1957237d327a37941c6eb3ff8d6b3 +Subproject commit 2c681d20c0afd203876bfd733b559eb021aa7cdf diff --git a/qtmacextras b/qtmacextras index 7f207d3e..941c7119 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 7f207d3e31fb768083462ef13a8163ab0a866212 +Subproject commit 941c71199526e31b9e462fe241f35bce782365d2 diff --git a/qtmultimedia b/qtmultimedia index c7bd3131..b64bdf32 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c7bd3131a8854814d59881339ac1d7a4af3c9863 +Subproject commit b64bdf32ce10b039e8d7b1be18d001e89f315615 diff --git a/qtnetworkauth b/qtnetworkauth index b82a17d8..ee0ce463 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b82a17d8ed996a8f2ff5902fdd229f3b68712c1d +Subproject commit ee0ce46332d364e76e9ec2b0adf7e5cbda504863 diff --git a/qtpurchasing b/qtpurchasing index 2fa73233..cc094b80 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 2fa7323376c99f6ef51fd22a68704e993a7f486f +Subproject commit cc094b80bffd972a1dc071e745888b213dde44f5 diff --git a/qtqa b/qtqa index 075ed07c..62a653d3 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 075ed07cbaef3da2be5a2f75739020f5ed15f893 +Subproject commit 62a653d32176956365f1fe8b5cb148a6391a6c9d diff --git a/qtquickcontrols b/qtquickcontrols index da94d658..cdbe52a8 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit da94d6586cbe6b9c12dec8ecc0f842aad807b0d3 +Subproject commit cdbe52a8f511e28ec0256c242d93f025fd21c55b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 788865b8..5c1aa494 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 788865b805bc91151ac8fe18bf7b92b1212ee07d +Subproject commit 5c1aa494e95b2945500e3c3e62240dd60e7190d6 diff --git a/qtremoteobjects b/qtremoteobjects index b94871ce..6d9f5fc2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit b94871ce10d5d319b7a3293cf939b6a072c3be26 +Subproject commit 6d9f5fc21cb272aad6c04b734f52c499e7e9e952 diff --git a/qtrepotools b/qtrepotools index a51db43b..0028759f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a51db43b580f774c64275cd3e1e0c707de2a04a4 +Subproject commit 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d94 diff --git a/qtscript b/qtscript index 5b75f4ed..18bade63 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5b75f4edd91a99945f04f34f78875d99e9d919bf +Subproject commit 18bade63bdcd1d8fcba013f788e114774efa0e4f diff --git a/qtscxml b/qtscxml index a57befb1..575d9217 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a57befb1da4b7386caf634293ab4563ad90c3107 +Subproject commit 575d92175aec3d6bd84872a9ad00adf924b6993d diff --git a/qtsensors b/qtsensors index 9b4c2e4f..fa7a6555 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9b4c2e4fcbe8700f0cf95cda887476e9a2d3a545 +Subproject commit fa7a65550daf4c1687e0a27f92e452d1cdd95dd3 diff --git a/qtserialbus b/qtserialbus index 80144b89..3ff518d2 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 80144b89ca1adede0db9d6e485037f5e431216c3 +Subproject commit 3ff518d2d05ce7eba511cc36509964f205470a93 diff --git a/qtserialport b/qtserialport index f6b43c36..2216279f 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f6b43c36b3839dae54308a6437bbdd99ae9a44de +Subproject commit 2216279ffd43fb84042da2faa5bc432770351ec3 diff --git a/qtspeech b/qtspeech index 9e2f02d8..91a78d0d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 9e2f02d8c8a05e9fe54cd56934fb00c4c5bd1da1 +Subproject commit 91a78d0d73a882dd5bf1692d773da7480ba6c4c7 diff --git a/qtsvg b/qtsvg index de830ffd..582bbf97 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit de830ffd455d8a2eb95eba81f86e9a75ed876765 +Subproject commit 582bbf973f608e8a3b9d5e3b8318eb995930e4a0 diff --git a/qttools b/qttools index 303d26c6..588571da 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 303d26c6d1c5e87e2e0d1f0032b28a6a50edee03 +Subproject commit 588571dabe9018b99f516f6e545a8a6323c76eb0 diff --git a/qttranslations b/qttranslations index ccb71797..36022c8e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ccb71797f2bc8f9ebd55954adc71370beed4165f +Subproject commit 36022c8e9263c1940710cd214965979e9bd8a036 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 57b9af92..28596bc3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 57b9af923b30ff301d60d86cf77fbbf1ab53bbbb +Subproject commit 28596bc340ac335a2759099c83db30d5c761d151 diff --git a/qtwayland b/qtwayland index 277de587..62e959ea 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 277de587f956dba2a68eb82b9666063ab12c51c4 +Subproject commit 62e959eaa707a163daca69a42c733bbd272d41d6 diff --git a/qtwebchannel b/qtwebchannel index e724c01b..3be3e575 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e724c01be4a5abf093d936ec263a51d4dfa3ab18 +Subproject commit 3be3e5756f867b34f29f18cbda9b0c2807017a71 diff --git a/qtwebengine b/qtwebengine index b44ed0fb..5e4487c2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b44ed0fb99cd3d7047fcd322010c27cfa7989a18 +Subproject commit 5e4487c2d9c72c54269db5fe8f333c75479ccb5f diff --git a/qtwebglplugin b/qtwebglplugin index 7e9f4028..11b83427 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 7e9f4028c5ac856d9a307927528fd4065f8b4ff8 +Subproject commit 11b83427d9770f50b5d8ec420ec810e393f3af8c diff --git a/qtwebsockets b/qtwebsockets index 24a9e0f9..a8bbc056 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 24a9e0f961d84af037999771948d3d3d9c683a6c +Subproject commit a8bbc056335719830a6b2746b7a85cfa2fd89164 diff --git a/qtwebview b/qtwebview index ca79ed44..2746b310 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ca79ed44d8c5cfa4270d5eca824a76cbcb5887fe +Subproject commit 2746b310f89e99144fff2a07e945a02e8c51d3da diff --git a/qtwinextras b/qtwinextras index 15b00862..b7896dfe 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 15b0086268a33e6469e300da9817f723ade0a588 +Subproject commit b7896dfef6c78f5d1579dcf4493d1cb665680cd6 diff --git a/qtx11extras b/qtx11extras index a5c017a0..0f6f4d20 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a5c017a00bcaf4d68a1cb6cc8a937d7af63be09b +Subproject commit 0f6f4d20f76eaf55eebfddfe49d9a6335f443d65 diff --git a/qtxmlpatterns b/qtxmlpatterns index 61f18cc3..74c5be96 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 61f18cc3619bbdeed47b0e161ff44089a6f82f0e +Subproject commit 74c5be960cbd4709cd8e4dee897cf53c00838128