From f6d18ec9b3e6cc65b687810f39a570a0b39439cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sun, 18 Mar 2018 15:04:13 +0200 Subject: [PATCH 01/12] Disable background update checks in RHEL 7.x Change-Id: If17fd47850be8b3a59ded7e0a543c9160f92b84c Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh index cd0f3dc2..548cb9ca 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh @@ -35,6 +35,10 @@ set -ex +echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf +sudo systemctl stop packagekit +sudo systemctl disable packagekit + sudo subscription-manager config --rhsm.manage_repos=0 sudo subscription-manager refresh From 3cb40d34d3af6ca4a8e23e8f15f6d508d3b4cee8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 19 Mar 2018 16:35:49 +0100 Subject: [PATCH 02/12] Update submodules on '5.11' in qt5 Change-Id: I12849c9612793703b598411c6a6b3c433f27b4fc Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index d6f62cc4..cde4f036 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d6f62cc4ca72ee97711b47425fbcda988a8de83e +Subproject commit cde4f0367392eb98e49155b72af75fecd13cd766 diff --git a/qtbase b/qtbase index 8edc08ef..2417cade 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8edc08ef78202f42f373efc6f0814744b01eac9a +Subproject commit 2417cade46d5680fe4a23ad2e3d1607b3989c758 diff --git a/qtdeclarative b/qtdeclarative index b1243b8c..958e412a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b1243b8c9ea0add1b7548428c8b0fcb8ee3ac71a +Subproject commit 958e412a25523cc031564faae81c569aa6c3b01f diff --git a/qtdoc b/qtdoc index e99e9a0f..78992b83 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e99e9a0fa1dbaac63426404b1b04f4a9c67dbff7 +Subproject commit 78992b83012eb36644a1da4affdede8baac9d2b5 diff --git a/qtlocation b/qtlocation index f93c464f..295db9e4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f93c464f7b0f2b3223a4d17cb52f6b5f4a6b0002 +Subproject commit 295db9e4a4c3a99199c030b0da8c7506cc39de28 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a8766caf..ce5b33c3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a8766caf09132bc08b7bc7eb3200607e2175d89d +Subproject commit ce5b33c350cb7aa4a649088d85e48be08b632b69 diff --git a/qtremoteobjects b/qtremoteobjects index ec564258..199090d2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ec564258e7f990e698cffa181f6e75cb359fa571 +Subproject commit 199090d2bac6b429e8c8ba114eea3bd3c4efc255 diff --git a/qtrepotools b/qtrepotools index dfb5e109..5655cafd 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit dfb5e10927531c56d69115df1a1a8ebb494065ec +Subproject commit 5655cafd10c3247715cdaf99d857f25af2a4be15 diff --git a/qtserialbus b/qtserialbus index 21538dec..20cbe35d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 21538dece0e38e0d4ab9bc6b4580687b40a411fa +Subproject commit 20cbe35dc3282b8e27278e3bd54d415cc8147d3c diff --git a/qttranslations b/qttranslations index f1c17f06..d168acdd 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f1c17f060d09ea3d225803afa9f82fa22117cd3b +Subproject commit d168acdd2afc6ffb1fa3c1d6788b628affbcac59 diff --git a/qtwayland b/qtwayland index c5b6bec8..c85d7a69 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c5b6bec872b2f22ec7b8d749d5f72b5ed0c4ddd4 +Subproject commit c85d7a69a0a639c8810bee6234dc79e63c82c0d9 diff --git a/qtwebengine b/qtwebengine index 29a9f9d6..51dbe583 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 29a9f9d6e4ad9ffee62d3633edb17c1be335203e +Subproject commit 51dbe583fc8775c45962394f95c3122d846c57d4 From 488dc5c36e4a7103d8271ae037d32dfb30b53831 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Mar 2018 18:24:54 +0100 Subject: [PATCH 03/12] Update submodules on '5.11' in qt5 Change-Id: Id1050cad70aad6d24368220769709b817dc70f8b Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtscxml | 2 +- qtsensors | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index cde4f036..96d7e817 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cde4f0367392eb98e49155b72af75fecd13cd766 +Subproject commit 96d7e81706114084e850f0215351d85be0486b5c diff --git a/qtbase b/qtbase index 2417cade..a65e383c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2417cade46d5680fe4a23ad2e3d1607b3989c758 +Subproject commit a65e383cac24b043b1dbe7172e0b142454e93e52 diff --git a/qtdeclarative b/qtdeclarative index 958e412a..2b0e0bee 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 958e412a25523cc031564faae81c569aa6c3b01f +Subproject commit 2b0e0bee0c6153a8912778de5ff1cabd728d98d8 diff --git a/qtlocation b/qtlocation index 295db9e4..1ced79ad 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 295db9e4a4c3a99199c030b0da8c7506cc39de28 +Subproject commit 1ced79ad7cc256eb82113e3419cb09926ceae9c3 diff --git a/qtmultimedia b/qtmultimedia index 306e8511..e0a069ed 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 306e8511602ac3c23778d6aef994269d17d3145c +Subproject commit e0a069edc2d79b69fd187ffbe03a8388a612b3ff diff --git a/qtscxml b/qtscxml index 544f8c4e..babefa4e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 544f8c4ef7b77c5194605cba612fdde6fa02b06b +Subproject commit babefa4ef71618e357521c8260b0714c5a0f1d2f diff --git a/qtsensors b/qtsensors index e8588efb..d8eef168 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2b +Subproject commit d8eef1687dbd7a39affaedc24f7faef320ef33bd diff --git a/qttools b/qttools index 5f00c476..00ee178b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5f00c4762b0aaa15c700b896398e3f94a85769b1 +Subproject commit 00ee178b2402720c915a76be40a2802024341bc6 diff --git a/qtwayland b/qtwayland index c85d7a69..26a6372b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c85d7a69a0a639c8810bee6234dc79e63c82c0d9 +Subproject commit 26a6372bb0c6528358e34f8175a14ff0be47fb12 diff --git a/qtwebengine b/qtwebengine index 51dbe583..831d20bf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 51dbe583fc8775c45962394f95c3122d846c57d4 +Subproject commit 831d20bfb1bd677245c1fbdd5ded0fc757c44541 diff --git a/qtxmlpatterns b/qtxmlpatterns index bba31cef..3bada53c 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit bba31cef71694feba0248a37edc1c843a9405ce4 +Subproject commit 3bada53c09f226398bcdeddfd633fd6df7c42ff7 From b59f4207a3ab830d963eb7b977b650f0e4d6442d Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Wed, 14 Mar 2018 08:09:42 +0200 Subject: [PATCH 04/12] Add Windows 8.1 target for RTA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifd055590bada66f7437af0b4de4a8549440952ae Reviewed-by: Johanna Äijälä Reviewed-by: Tony Sarajärvi --- coin/platform_configs/tqtc-qt-rta.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 5453a022..8143688f 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -1,5 +1,6 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86-6 MSVC2017 Release ForceDebugInfo OpenGLDynamic From 418cb4c4f5b199b8a9ed71752f70c711882ad42f Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 21 Mar 2018 08:23:35 +0200 Subject: [PATCH 05/12] Provisioning: Win8.1_x64 - Add Python2 and Python3 for RTA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python is required by RTA. Task-number: QTQAINFRA-1870 Change-Id: If63218da138995580a3bed5ede8996d722fff48d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-8.1-x86_64/07-python2.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 | 1 + 2 files changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/07-python2.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-python2.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-python2.ps1 new file mode 100644 index 00000000..e2e9be9c --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-python2.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 new file mode 100644 index 00000000..998e6bae --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python3.ps1" From 9ae91ae3f87fb3e3ad030410c4d313cb217f530b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 19 Mar 2018 12:38:45 +0100 Subject: [PATCH 06/12] Update Python 3.4 to 3.6 in RHEL 7.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also install Python 3 through system packages instead of some weird scripts. Change-Id: Ie22e126a422bd6efe9b3030d5044f4c196894ca8 Reviewed-by: Simo Fält --- .../04-install-packages.sh | 5 ++ .../08-pythondev.sh | 54 ------------------- 2 files changed, 5 insertions(+), 54 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 7c595e3a..710ac87d 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -66,6 +66,8 @@ installPackages+=(libusbx-devel) installPackages+=(speech-dispatcher-devel) # Python installPackages+=(python-devel python-virtualenv) +# Python 3 with python-devel, pip and virtualenv +installPackages+=(rh-python36) # WebEngine installPackages+=(bison) installPackages+=(flex) @@ -91,3 +93,6 @@ installPackages+=(libffi-devel) sudo yum -y update sudo yum -y install "${installPackages[@]}" + +sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 +sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh deleted file mode 100755 index 4e75633d..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ /dev/null @@ -1,54 +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 - -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -# install python3 -sudo yum install -y python34-devel - -# install pip3 - -packagePip="get-pip.py" -OfficialUrlPip="https://bootstrap.pypa.io/$packagePip" -CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip" -SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d" - -DownloadURL $CachedUrlPip $OfficialUrlPip $SHA1Pip ./$packagePip -sudo python3 $packagePip -sudo rm -f $packagePip -sudo pip3 install virtualenv - From ab021d4bb4a92143892a68d89dbe9f3dd4e3f81f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 19 Mar 2018 15:36:22 +0200 Subject: [PATCH 07/12] Make unzip less verbose in macOS Change-Id: I83249f724ecbfeeb4fd5c1cd33a9c6195c590c4b Reviewed-by: Oliver Wolff --- .../common/macos/InstallAppFromCompressedFileFromURL.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh index d322e806..d20a4ed8 100755 --- a/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh @@ -76,7 +76,7 @@ function InstallAppFromCompressedFileFromURL { tar -xzf "$targetFile" --directory "$targetDirectory" ;; "zip") - unzip "$targetFile" -d "$targetDirectory" + unzip -q "$targetFile" -d "$targetDirectory" ;; *) exit 1 From f1eca9bbff35b4640c4779fb4b5cad25c33f7de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 21 Mar 2018 09:47:37 +0200 Subject: [PATCH 08/12] Remove duplicate python-devel provisioning from RHEL 7.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I445135d675fa6b5cb305f6aadf5b754ab248a1ff Reviewed-by: Simo Fält --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 710ac87d..74900f78 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -48,7 +48,6 @@ installPackages+=(mesa-libGL-devel) installPackages+=(libxkbfile-devel) # Xinput2 installPackages+=(libXi-devel) -installPackages+=(python-devel) installPackages+=(mysql-server) installPackages+=(mysql) installPackages+=(mysql-devel) From de4e9c2169aac41db10fdff1503ad645f0a4a72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 7 Mar 2018 10:12:28 +0200 Subject: [PATCH 09/12] Provisioning: refactor squish install Change-Id: I18e5f8f5d92cff5af2335cc5ac4cf571d27224ac Reviewed-by: Heikki Halmet --- .../common/windows/squishInstall.ps1 | 99 +++++++------------ 1 file changed, 33 insertions(+), 66 deletions(-) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 31ae8264..270f91d4 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -33,13 +33,18 @@ . "$PSScriptRoot\helpers.ps1" - # This script will install squish package for Windows. # Squish is need by Release Test Automation (RTA) +# NOTE! Make sure 64bit versions are always installed before 32bit, +# because they use same folder name before a rename $version = "6.3.0" + # Qt branch without dot (*.*) $qtBranch = "59x" +# So far Squish built with Qt5.9 works also with 5.10 and 5.11, but we have to be prepared that on some point +# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. + $targetDir = "C:\Utils\squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" $squishBranchUrl = "$squishUrl\$qtBranch" @@ -49,23 +54,10 @@ $licensePackage = ".squish-3-license" $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName -# This can be removed when using vanilla os -if ((Test-Path -Path "$targetDir" )) { - try { - Write-Host "Renaming old Squish" - Write-Host "Rename-Item -ErrorAction 'Stop' $targetDir $targetDir_deleted" - Rename-Item -ErrorAction 'Stop' "$targetDir" squish_deleted - } catch {} -} - Function DownloadAndInstallSquish { - Param ( [string]$version, - [string]$squishBranchUrl, - [string]$qtBranch, [string]$bit, - [string]$targetDir, [string]$squishPackage ) @@ -78,81 +70,56 @@ Function DownloadAndInstallSquish { Write-Host "Installing Squish" Run-Executable "$SquishInstaller" "$SquishParameters" Remove-Item -Path $SquishInstaller + if ("$bit" -eq "win64") { + if ($squishPackage.StartsWith("mingw")) { + $squishPackage64bit = "mingw_64" + } else { + $squishPackage64bit = "$squishPackage`_64" + } + Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit + } else { + if ($squishPackage.StartsWith("mingw")) { + Rename-Item $targetDir\$squishPackage $targetDir\mingw + } + } } Function DownloadSquishLicence { - Param ( - [string]$licensePackage, - [string]$squishUrl, - [string]$targetDir + [string]$squishUrl ) - # This can be removed when using vanilla os - if ($Env:SQUISH_LICENSEKEY_DIR) { - Write-Host "Removing SQUISH_LICENSEKEY_DIR env variable" - Remove-Item Env:\SQUISH_LICENSEKEY_DIR - } - Write-Host "Installing Squish license to home directory" Copy-Item $squishUrl\$licensePackage ~\$licensePackage } + Write-Host "Creating $targetDir" New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir" -DownloadSquishLicence $licensePackage $squishUrl $targetDir +DownloadSquishLicence $squishUrl -if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 8.1 Enterprise")) { - # Squish for MinGW - $squishPackageMingw = "mingw_gcc53_posix_dwarf" - Write-Host "Installing $squishPackageMingw" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw - mv $targetDir\$squishPackageMingw $targetDir\mingw - - # Squish for Visual Studio 2015 - $squishPackage = "msvc14" - $squishPackage64bit = "msvc14_64" +if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { - Write-Host "Installing $squishPackage64bit" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit + DownloadAndInstallSquish $version win64 msvc14 } + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" + DownloadAndInstallSquish $version win32 "msvc14" - Write-Host "Installing $squishPackage" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage -} -if ($OSVersion -eq "Windows 8.1 Enterprise") { - # Squish for Visual Studio 2013 - $squishPackage64bit = "msvc12_64" +} elseif ($OSVersion -eq "Windows 8.1 Enterprise") { if (Is64BitWinHost) { - Write-Host "Installing $squishPackage_64" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit - } else { - Write-Host "Change secret file to normal one" - Run-Executable "attrib.exe" "-h C:\Users\qt\.squish-3-license" + DownloadAndInstallSquish $version win64 "msvc12" + DownloadAndInstallSquish $version win64 "msvc14" } -} -if ($OSVersion -eq "Windows 7 Enterprise") { - # Squish for MinGW - $squishPackageMingw = "mingw_gcc53_posix_dwarf" - Write-Host "Installing $squishPackageMingw" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw - Rename-Item $targetDir\$squishPackageMingw $targetDir\mingw + DownloadAndInstallSquish $version win32 "msvc14" - # Squish for Visual Studio 2015 - $squishPackage = "msvc14" - $squishPackage64bit = "msvc14_64" +} elseif ($OSVersion -eq "Windows 7 Enterprise") { if (Is64BitWinHost) { - Write-Host "Installing $squishPackage64bit" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit + DownloadAndInstallSquish $version win64 "msvc14" } - - Write-Host "Installing $squishPackage" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" + DownloadAndInstallSquish $version win32 "msvc14" } From 5085220907005503326b8d4f17d52b5e6e00d731 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 21 Mar 2018 08:29:50 +0200 Subject: [PATCH 10/12] Provisioning: Win7_x64 - Add Squish 6.3.0 win64 msvc12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This package is required by RTA. Task-number: QTQAINFRA-1878 Change-Id: I0496445880f838de34ffd53f72fa05e0f0b0be58 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/squishInstall.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 270f91d4..fe221890 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -118,6 +118,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { } elseif ($OSVersion -eq "Windows 7 Enterprise") { if (Is64BitWinHost) { + DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" From 794913dde77e9a2918353894a33d03b16e6927c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 21 Mar 2018 11:26:05 +0200 Subject: [PATCH 11/12] Install Python 2.7.13 to RHEL with pip MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit System's default Python is 2.7.5 and doesn't come with pip at all. To install its pip, it would require us to enable the EPEL repository and install it from there. The repos we use already include Python 2.7.13. If we install that we get pip as well. Change-Id: I083a970697a962ddb301616695c2cf419f1229f8 Reviewed-by: Simo Fält --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 74900f78..56ed138a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -63,8 +63,8 @@ installPackages+=(gtk3-devel) installPackages+=(libusbx-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux installPackages+=(speech-dispatcher-devel) -# Python -installPackages+=(python-devel python-virtualenv) +# Python 2.7 with python-devel, pip and virtualenv +installPackages+=(python27) # Python 3 with python-devel, pip and virtualenv installPackages+=(rh-python36) # WebEngine @@ -93,5 +93,8 @@ installPackages+=(libffi-devel) sudo yum -y update sudo yum -y install "${installPackages[@]}" +# Make python 2.7 and its pip default +echo "source scl_source enable python27" >> ~/.bashrc + sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 From 8197e80155a9b4d8d0fe68411b44b69576b13ebd Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 21 Mar 2018 08:42:21 +0200 Subject: [PATCH 12/12] Provisioning: Remove Java update from windows startup items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iec709c9c42840910ab0dd98634c200d2aba8f7bf Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/install-jdk.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 73750489..0c548e63 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -71,6 +71,9 @@ Run-Executable "$javaPackage" "/s SPONSORS=0" Write-Host "Cleaning $javaPackage.." Remove-Item -Recurse -Force -Path "$javaPackage" +Write-Host "Remove Java update from startup" +reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f + Set-EnvironmentVariable "JAVA_HOME" "$installdir" Add-Path "$installdir\bin"