From 456a4d6453787002538c446fa8a37f41172fe55d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Feb 2018 14:01:07 +0100 Subject: [PATCH 01/16] Update submodules on '5.10' in qt5 Change-Id: I935d6ad075384973425d48782a105a9e3e7d21a0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtspeech | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 04afcf1c..dc6388e0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 04afcf1cb9e79697360baa01a97a26815237eba1 +Subproject commit dc6388e0d7fba2e05346e8e91c9f683742420f98 diff --git a/qtcharts b/qtcharts index b830bb00..05f5f9a6 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b830bb006a7d8c27cc019b6737c669e96098bc3f +Subproject commit 05f5f9a6f949522a92bd5bfe520358c2ba123d7b diff --git a/qtdeclarative b/qtdeclarative index 6fe4c1f2..3e3c6717 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6fe4c1f2803abac74da152b9a5656eff2d71dceb +Subproject commit 3e3c6717ba634825a65069541500c40645a808ee diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a5aa09df..b3b079f1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a5aa09dfd7e42f38545fe4640b0fa251bdd32be9 +Subproject commit b3b079f1578527859aa1f5137ee8f2ec163923fb diff --git a/qtspeech b/qtspeech index f5aaee80..c7b57997 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f5aaee80166be7969a71496d2fd9a8152d8effb4 +Subproject commit c7b57997dcc96c2820714b2ef6e3bcfe93193614 diff --git a/qtwebengine b/qtwebengine index 75c40c17..8be09562 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 75c40c1799db3ba3919d5288c4f861585dc4a630 +Subproject commit 8be09562ea225d6bbec98d813a19816e7e651f53 From b2b076782f09f35652c22a18d4c721ad79fda405 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Feb 2018 03:00:53 +0200 Subject: [PATCH 02/16] Update submodules on '5.10' in qt5 Change-Id: I06c4afea4e574aa78f37009db512ba25194f6d5d Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 28cf5ae0..c48f4bde 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 28cf5ae000de36cd6ad0df942c2f99bfa7e22129 +Subproject commit c48f4bde0044bd5b23af231f3639d0779ecbdb03 From e30de965b90269fa651df6b427f7a817aa38c7c7 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 8 Feb 2018 13:39:13 +0100 Subject: [PATCH 03/16] .gitmodules: update recommended modules for qtvirtualkeyboard The basic example will start using qtquickcontrols2, so recommend that. Remove qtquickcontrols, as it wasn't used. Change-Id: Ieaab1480e6a85ecaa24888fa58024d728d863a16 Reviewed-by: Oswald Buddenhagen --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 3d8128eb..05e62ba0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -271,7 +271,7 @@ status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg - recommends = qtmultimedia qtquickcontrols + recommends = qtmultimedia qtquickcontrols2 path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.10 From 5611fe34b0530268ca4f6a354c39876914fc798e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 10 Feb 2018 03:03:07 +0200 Subject: [PATCH 04/16] Update submodules on '5.10' in qt5 Change-Id: Ica319a5d98406174ce94d2e3c3784364ab44c642 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt3d b/qt3d index dc6388e0..e1d1a59e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dc6388e0d7fba2e05346e8e91c9f683742420f98 +Subproject commit e1d1a59eb04f8b17582571275073a6cfa10e9e32 diff --git a/qtquickcontrols b/qtquickcontrols index 48bfc02e..9dc39b7f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 48bfc02e82cb4b666fb832ef0ace59af8a0c7ef2 +Subproject commit 9dc39b7f0610990dabf9f8544ca64ff5175e7c77 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b3b079f1..95b4996a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b3b079f1578527859aa1f5137ee8f2ec163923fb +Subproject commit 95b4996a04989aa26c8fba8aaa90b76b7166c2c1 From c77d4946b2c470f65b5dc598ca277a893cbeb18d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Feb 2018 03:01:36 +0200 Subject: [PATCH 05/16] Update submodules on '5.10' in qt5 Change-Id: Ie45f18cc0c70cca437cadd8bfaa6e8a4ac0c81b8 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index c48f4bde..4ba53561 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c48f4bde0044bd5b23af231f3639d0779ecbdb03 +Subproject commit 4ba535616b8d3dfda7fbe162c6513f3008c1077a From 8eed3b5be400a382818a786481ce2a4f8bd2497a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Feb 2018 03:01:29 +0200 Subject: [PATCH 06/16] Update submodules on '5.11' in qt5 Change-Id: I1447f714aa1035c2cdbe423935cc5a67a700de2d Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 51dca651..05185633 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 51dca6514593978beb28afa1c9f99ccd9a5c212c +Subproject commit 05185633763b9916331be868f33a36018dcf2b4b diff --git a/qtbase b/qtbase index 8a66924c..02eb264a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8a66924ca000fe4e05b680ca82c6587da8d28e0b +Subproject commit 02eb264aa2db20fac479a749c39044cc9ed304b2 diff --git a/qtdeclarative b/qtdeclarative index ba05397a..c9398266 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ba05397ad723fa19125eb5ca2f91c7f437b21484 +Subproject commit c9398266d804d570f305590df9481028c9880175 diff --git a/qtdoc b/qtdoc index 83a5f5be..2487a508 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 83a5f5be0e4464ec9b7698c03fffe9b6d379199c +Subproject commit 2487a5086711aa7154d049bb197e95847b5bfd63 diff --git a/qtlocation b/qtlocation index 3d2993d0..d458bd47 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3d2993d0c31540f48244918541741c5d521a4dc4 +Subproject commit d458bd47106dd849e6cf72b97a27f871735e4eed diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c924a94f..e80d273e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c924a94fb5077028965e2c6343e1bafabc0e69f8 +Subproject commit e80d273e6f19ba0a6a0f4e830724a36785ef19f6 diff --git a/qtscxml b/qtscxml index f71a6d1a..544f8c4e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit f71a6d1a746d5ceb19ce017902c83e1819b5c0ea +Subproject commit 544f8c4ef7b77c5194605cba612fdde6fa02b06b diff --git a/qtserialbus b/qtserialbus index bfb218c4..7c6e9d8f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit bfb218c46324f89dd435ddfa0dbfe3643fcc2d27 +Subproject commit 7c6e9d8f29148793dc619a743a0b5d3a601ec34b diff --git a/qttools b/qttools index c0bfa2a9..c29a1b03 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c0bfa2a930f6414d41684e578b59872defdffdf9 +Subproject commit c29a1b03fd0fe6cc3496a6a14c56f6ef3390b713 diff --git a/qttranslations b/qttranslations index 25eb2bbb..f1c17f06 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 25eb2bbb4bf5e7b556d60b2328a19fcedbc3f4fe +Subproject commit f1c17f060d09ea3d225803afa9f82fa22117cd3b diff --git a/qtwayland b/qtwayland index abfdf34f..ec495c98 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit abfdf34f510b64439c85cc54f47b41c4ce3f9c61 +Subproject commit ec495c98189f1d849e793108b09b5af0ce2c8984 diff --git a/qtwebengine b/qtwebengine index 51658fac..732d0933 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 51658fac63299f818afd8ddde6dccee66a36efda +Subproject commit 732d09331c1e4efa51501aae9bcd6924eecdd5c3 diff --git a/qtwebglplugin b/qtwebglplugin index 961198b4..d73338df 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 961198b42104ea644580b14e763ec87bda0e966c +Subproject commit d73338df3809c8551f387c7192725683d52746d8 From acbedcc314177a33a8faab2e7fce22cd991e6024 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 21 Feb 2018 11:52:00 +0100 Subject: [PATCH 07/16] Provisioning: Update Open62541 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required to use new APIs from the library. Change-Id: Idbadfd04c331af228a9e095e130930b5fb88f7af Reviewed-by: Jannis Völker Reviewed-by: Frank Meerkoetter --- coin/provisioning/common/linux/open62541.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh index fc215e8a..878bfe0d 100755 --- a/coin/provisioning/common/linux/open62541.sh +++ b/coin/provisioning/common/linux/open62541.sh @@ -53,7 +53,7 @@ sudo pip install six git clone https://github.com/open62541/open62541.git open62541 cd open62541 -git checkout 302003d2448946fa4d8a02cc209b8931d31e975b +git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629 mkdir build cd build cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib .. From ae17b63db218401feee67c17ffdcb7863c3c9e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 14 Feb 2018 15:07:06 +0200 Subject: [PATCH 08/16] Add shebang to launchable script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I62e33b656eee3a17e1dab4476569d9afa0b62a45 Reviewed-by: Joni Jäntti Reviewed-by: Edward Welbourne --- coin/provisioning/common/linux/disable_selinux.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/common/linux/disable_selinux.sh b/coin/provisioning/common/linux/disable_selinux.sh index 30162166..64852e79 100755 --- a/coin/provisioning/common/linux/disable_selinux.sh +++ b/coin/provisioning/common/linux/disable_selinux.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + # We need to disable selinux while we are overwriting some binaries # required by it. If this is not done, ICU provisioning will create # template that is not booting. From 3a3c6fb2b37613805ca5a8a3f1adb8d146c66224 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 20 Feb 2018 13:30:48 +0200 Subject: [PATCH 09/16] Provisioning: Fix Windows 10 msvc 2014 squish installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id935580730d20a2f86fa6c82bf08ee3705f344f2 Reviewed-by: Joni Jäntti Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/squishInstall.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 7641c9fe..b1739e6a 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -138,7 +138,7 @@ if($OSVersion -eq "Windows 8.1 Enterprise") attrib -h C:\Users\qt\.squish-3-license } } -else +if($OSVersion -eq "Windows 7") { # Windows 7 From 54d8396d681c97ace18e2710394b8b34fa8f0411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 2 Jan 2018 12:58:13 +0200 Subject: [PATCH 10/16] Set proxy on Windows VMs while provisioning Task-number: QTQAINFRA-1669 Change-Id: Ia6b5b668051642a3729d7c7c83c69d8797045847 Reviewed-by: Heikki Halmet --- .../common/{unix => }/http_proxy.txt | 0 .../common/unix/check_and_set_proxy.sh | 2 +- coin/provisioning/common/windows/helpers.ps1 | 8 +++ coin/provisioning/common/windows/python.ps1 | 4 ++ coin/provisioning/common/windows/python3.ps1 | 4 ++ .../provisioning/common/windows/set-proxy.ps1 | 64 +++++++++++++++++++ .../common/windows/unset-proxy.ps1 | 41 ++++++++++++ .../qtci-windows-10-x86/01-set-proxy.ps1 | 1 + .../qtci-windows-10-x86/99-unset-proxy.ps1 | 1 + .../qtci-windows-10-x86_64/01-set-proxy.ps1 | 1 + .../qtci-windows-10-x86_64/99-unset-proxy.ps1 | 1 + .../qtci-windows-7-x86/01-set-proxy.ps1 | 1 + .../qtci-windows-7-x86/99-unset-proxy.ps1 | 1 + 13 files changed, 128 insertions(+), 1 deletion(-) rename coin/provisioning/common/{unix => }/http_proxy.txt (100%) create mode 100644 coin/provisioning/common/windows/set-proxy.ps1 create mode 100644 coin/provisioning/common/windows/unset-proxy.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-set-proxy.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/99-unset-proxy.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/01-set-proxy.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/99-unset-proxy.ps1 diff --git a/coin/provisioning/common/unix/http_proxy.txt b/coin/provisioning/common/http_proxy.txt similarity index 100% rename from coin/provisioning/common/unix/http_proxy.txt rename to coin/provisioning/common/http_proxy.txt diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh index 8dad878c..38905d56 100755 --- a/coin/provisioning/common/unix/check_and_set_proxy.sh +++ b/coin/provisioning/common/unix/check_and_set_proxy.sh @@ -33,7 +33,7 @@ ############################################################################# source "${BASH_SOURCE%/*}/try_catch.sh" -source "${BASH_SOURCE%/*}/http_proxy.txt" +source "${BASH_SOURCE%/*}/../http_proxy.txt" try ( diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index b24de870..9c6706a2 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -144,3 +144,11 @@ Function Execute-Command exit 1 } } + +function isProxyEnabled { + return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable +} + +function getProxy { + return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer +} diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index c3eba2d8..fe75aa35 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -63,4 +63,8 @@ Add-Path "C:\Python27;C:\Python27\Scripts" C:\Python27\python.exe -m ensurepip # Install python virtual env +#if ( isProxyEnabled ) { +# echo "Using proxy with pip" +# $pip_args = "--proxy=" + (getProxy) +#} C:\Python27\Scripts\pip.exe install virtualenv diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 316b567a..23ddb553 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -67,4 +67,8 @@ del $package [Environment]::SetEnvironmentVariable("PIP3_PATH", "$install_path\Scripts", [EnvironmentVariableTarget]::Machine) # Install python virtual env +#if ( isProxyEnabled ) { +# echo "Using proxy with pip" +# $pip_args = "--proxy=" + (getProxy) +#} cmd /c "$install_path\Scripts\pip3.exe install virtualenv" diff --git a/coin/provisioning/common/windows/set-proxy.ps1 b/coin/provisioning/common/windows/set-proxy.ps1 new file mode 100644 index 00000000..914769f1 --- /dev/null +++ b/coin/provisioning/common/windows/set-proxy.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +$n = Get-Content "$PSScriptRoot\..\http_proxy.txt" +$n = $n.Split('=') +New-Variable -Name $n[0] -Value $n[1] + +if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) { + echo "No proxy is defined." +} +else { + echo "Checking proxy @ $proxy" + $proxy = $proxy -replace '"', "" + $webclient = New-Object System.Net.WebClient + $proxy_obj = New-Object System.Net.WebProxy($proxy) + $webclient.proxy = $proxy_obj + try { + $webpage = $webclient.DownloadData("http://proxy.intra.qt.io") + } + catch { + $ErrorMessage = $_.Exception.Message + $FailedItem = $_.Exception.ItemName + $iserror = $true + } + if ($iserror -eq $true) { + echo "Testing download with proxy does not work: $ErrorMessage, $FailedItem. Not setting proxy." + } + else { + echo "Setting proxy to: $proxy" + Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer -Value "$proxy" + Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyEnable -Value 1 + Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride -Value 10.215 + } +} diff --git a/coin/provisioning/common/windows/unset-proxy.ps1 b/coin/provisioning/common/windows/unset-proxy.ps1 new file mode 100644 index 00000000..86374ec1 --- /dev/null +++ b/coin/provisioning/common/windows/unset-proxy.ps1 @@ -0,0 +1,41 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +echo "Disabling proxy" +$dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections").DefaultConnectionSettings +$dcs[8] = $_ -band 0xF7 +Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs +Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyEnable -Value 0 +Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer +Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride + diff --git a/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 new file mode 100644 index 00000000..13b1ec60 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\set-proxy.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 new file mode 100644 index 00000000..0c25a0fb --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\unset-proxy.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-set-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-set-proxy.ps1 new file mode 100644 index 00000000..13b1ec60 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-set-proxy.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\set-proxy.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-unset-proxy.ps1 new file mode 100644 index 00000000..0c25a0fb --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/99-unset-proxy.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\unset-proxy.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/01-set-proxy.ps1 b/coin/provisioning/qtci-windows-7-x86/01-set-proxy.ps1 new file mode 100644 index 00000000..13b1ec60 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/01-set-proxy.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\set-proxy.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-7-x86/99-unset-proxy.ps1 new file mode 100644 index 00000000..0c25a0fb --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/99-unset-proxy.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\unset-proxy.ps1" From b1a212b52ea909adc95078c0100f962762daef81 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Thu, 22 Feb 2018 10:22:12 +0200 Subject: [PATCH 11/16] Provisioning: Make Windows scripts use the Download helper function Some Windows provisioning scripts use the Invoke-WebRequest without setting the ProgressPreference = 'SilentlyContinue' variable for disabling the download progress bar. Disabling the progress bar greatly increases the download speed during provisioning. Change-Id: I649c1bcc970577776d720a4ebf5a7af96c1603f8 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/3dstudio_3rdparty.ps1 | 3 ++- coin/provisioning/common/windows/install-jdk.ps1 | 4 ++-- coin/provisioning/common/windows/winrtrunner.ps1 | 3 ++- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 index f9c8faa7..b6804a77 100644 --- a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 +++ b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 @@ -1,8 +1,9 @@ . "$PSScriptRoot\helpers.ps1" $zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip" +$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip +Download $url $url $zip Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1" Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty Remove-Item $zip diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index f6cf6a66..63e5edaf 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -55,7 +55,7 @@ echo "Fetching Java SE $version..." $ProgressPreference = 'SilentlyContinue' try { echo "...from local cache" - Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage + Download $url_cache $url_cache $javaPackage } catch { echo "...from oracle.com" $client = new-object System.Net.WebClient @@ -63,7 +63,7 @@ try { $client.Headers.Add("Cookie", $cookie) $client.DownloadFile($official_url, $javaPackage) - Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage + Download $official_url $official_url $javaPackage } Verify-Checksum $javaPackage $sha1 diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1 index f433ac7a..d53c12d6 100644 --- a/coin/provisioning/common/windows/winrtrunner.ps1 +++ b/coin/provisioning/common/windows/winrtrunner.ps1 @@ -1,8 +1,9 @@ . "$PSScriptRoot\helpers.ps1" $zip = "c:\users\qt\downloads\winrtrunner.zip" +$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip" -Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip -OutFile $zip +Download $url $url $zip Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42" Extract-Zip $zip C:\Utils\winrtrunner Remove-Item $zip diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index a7a8c035..d2864281 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,8 +36,9 @@ # This script installs QNX SDP 7.0 $zip = "c:\users\qt\downloads\qnx700.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip +Download $url $url $zip Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7" Extract-7Zip $zip C:\ From 5e31866727b4485f07a17295277be889305c4b3b Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 20 Feb 2018 14:51:05 +0200 Subject: [PATCH 12/16] Provisioning: Win10 - Add Squish for mingw53 RTA requires Squish for mingw53 on Windows 10 machines for testing. Task-number: QTQAINFRA-1729 Change-Id: I42f2c6c62dd004ebc072835340ce24105cfac5e8 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/squishInstall.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index b1739e6a..c4d56e07 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -107,6 +107,12 @@ DownloadSquishLicence $licensePackage $squishUrl $targetDir if(($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 8.1 Enterprise")) { + # Squish for MinGW + $squishPackageMingw = "mingw_gcc53_posix_dwarf" + echo "Installing $squishPackageMingw" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw + mv $targetDir\$squishPackageMingw $targetDir\mingw + # Squish for Visual Studio 2015 $squishPackage = "msvc14" $squishPackage64bit = "msvc14_64" From c3b33afc322dc24120741722b680d0cccc3e2cb1 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Wed, 7 Jun 2017 09:21:59 +0300 Subject: [PATCH 13/16] Provisioning: osx-10.11 - Java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for running RTA jobs in Coin. Change-Id: Iff855dae54babef00c055a2c8b938871101305e3 Reviewed-by: Simo Fält --- coin/provisioning/common/macos/java.sh | 132 +++++++++++++++++ .../qtci-macos-10.12-x86_64/20-java.sh | 133 +----------------- .../qtci-osx-10.11-x86_64/30-java.sh | 3 + 3 files changed, 137 insertions(+), 131 deletions(-) create mode 100755 coin/provisioning/common/macos/java.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/30-java.sh diff --git a/coin/provisioning/common/macos/java.sh b/coin/provisioning/common/macos/java.sh new file mode 100755 index 00000000..0961e21a --- /dev/null +++ b/coin/provisioning/common/macos/java.sh @@ -0,0 +1,132 @@ +#!/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$ +## +############################################################################# + +# This script installs JDK + +set -ex + +echo "Installing Java Development Kit" + +# shellcheck source=../unix/try_catch.sh +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" + +ExceptionDownloadPrimaryUrl=100 +ExceptionDownloadAltUrl=101 +ExceptionSHA1=102 +ExceptionAttachImage=103 +ExceptionInstall=104 +ExceptionDetachImage=105 +ExceptionRemoveTmpFile=106 +ExceptionDisableAutoUpdate=107 + + +url=http://ci-files01-hki.intra.qt.io/input/mac/jdk-8u102-macosx-x64.dmg +url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg +targetFile=/tmp/jdk-8u102-macosx-x64.dmg +expectedSha1=1405af955f14e32aae187b5754a716307db22104 + +try +( + try + ( + echo "Downloading from primary URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl + ) + catch || { + case $ex_code in + $ExceptionDownloadPrimaryUrl) + echo "Failed to download '$url' multiple times" + echo "Downloading tar.gz from alternative URL '$url_alt'" + curl --fail -L --retry 5 --retry-delay 5 -j -k -H "Cookie: oraclelicense=accept-securebackup-cookie" -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl + ;; + esac + } + echo "Checking SHA1 on '$targetFile'" + echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + + echo Mounting DMG + hdiutil attach "$targetFile" || throw $ExceptionAttachImage + + echo Installing JDK + (cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /) || throw $ExceptionInstall + + disk=`hdiutil info | grep '/Volumes/JDK 8 Update 102' | awk '{print $1}'` + hdiutil detach $disk || throw $ExceptionDetachImage + + echo "Removing temporary file '$targetFile'" + rm "$targetFile" || throw $ExceptionRemoveTmpFile + + echo "Disable auto update" + sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false || throw $ExceptionDisableAutoUpdate + + echo "JDK Version = 8 update 102" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionDownloadPrimaryUrl) + echo "Failed to download JDK from primary URL." + exit 1; + ;; + $ExceptionDownloadAltUrl) + echo "Failed to download JDK from alternative URL." + exit 1; + ;; + $ExceptionSHA1) + echo "Failed to check SHA1." + exit 1; + ;; + $ExceptionAttachImage) + echo "Failed to attach image." + exit 1; + ;; + $ExceptionInstall) + echo "Failed to install JDK." + exit 1; + ;; + $ExceptionDetachImage) + echo "Failed to detach image." + exit 1; + ;; + $ExceptionRemoveTmpFile) + echo "Failed to remove temporary file." + exit 1; + ;; + $ExceptionDisableAutoUpdate) + echo "Failed to disable auto update." + exit 1; + ;; + + esac +} diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 66e4dfde..8877c40b 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -1,132 +1,3 @@ #!/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$ -## -############################################################################# - -# This script installs JDK - -set -ex - -echo "Installing Java Development Kit" - -# shellcheck source=../common/unix/try_catch.sh -source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" - -ExceptionDownloadPrimaryUrl=100 -ExceptionDownloadAltUrl=101 -ExceptionSHA1=102 -ExceptionAttachImage=103 -ExceptionInstall=104 -ExceptionDetachImage=105 -ExceptionRemoveTmpFile=106 -ExceptionDisableAutoUpdate=107 - - -url=http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg -url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg -targetFile=/tmp/jdk-8u102-macosx-x64.dmg -expectedSha1=1405af955f14e32aae187b5754a716307db22104 - -try -( - try - ( - echo "Downloading from primary URL '$url'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl - ) - catch || { - case $ex_code in - $ExceptionDownloadPrimaryUrl) - echo "Failed to download '$url' multiple times" - echo "Downloading tar.gz from alternative URL '$url_alt'" - curl --fail -L --retry 5 --retry-delay 5 -j -k -H "Cookie: oraclelicense=accept-securebackup-cookie" -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl - ;; - esac - } - echo "Checking SHA1 on '$targetFile'" - echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 - - echo Mounting DMG - hdiutil attach "$targetFile" || throw $ExceptionAttachImage - - echo Installing JDK - (cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /) || throw $ExceptionInstall - - disk=`hdiutil info | grep '/Volumes/JDK 8 Update 102' | awk '{print $1}'` - hdiutil detach $disk || throw $ExceptionDetachImage - - echo "Removing temporary file '$targetFile'" - rm "$targetFile" || throw $ExceptionRemoveTmpFile - - echo "Disable auto update" - sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false || throw $ExceptionDisableAutoUpdate - - echo "JDK Version = 8 update 102" >> ~/versions.txt -) -catch || { - case $ex_code in - $ExceptionDownloadPrimaryUrl) - echo "Failed to download JDK from primary URL." - exit 1; - ;; - $ExceptionDownloadAltUrl) - echo "Failed to download JDK from alternative URL." - exit 1; - ;; - $ExceptionSHA1) - echo "Failed to check SHA1." - exit 1; - ;; - $ExceptionAttachImage) - echo "Failed to attach image." - exit 1; - ;; - $ExceptionInstall) - echo "Failed to install JDK." - exit 1; - ;; - $ExceptionDetachImage) - echo "Failed to detach image." - exit 1; - ;; - $ExceptionRemoveTmpFile) - echo "Failed to remove temporary file." - exit 1; - ;; - $ExceptionDisableAutoUpdate) - echo "Failed to disable auto update." - exit 1; - ;; - - esac -} +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/java.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/30-java.sh b/coin/provisioning/qtci-osx-10.11-x86_64/30-java.sh new file mode 100755 index 00000000..8877c40b --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/30-java.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/java.sh From f6f5cc70e9a19cae8c144ab5f2c3d79f2302f6e8 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Thu, 15 Feb 2018 15:41:01 +0200 Subject: [PATCH 14/16] Provisioning: openSUSE-42.3 - Disable update notifications Update notifications need to be disabled to prevent popup messages from stealing focus during testing. Task-number: QTQAINFRA-1755 Change-Id: I202ffbee6420d2c9c167a97f02d5245145b618d0 Reviewed-by: Heikki Halmet --- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index c0e7b8e9..f53a2943 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -17,6 +17,8 @@ echo "Set DISPLAY" echo 'export DISPLAY=":0"' >> ~/.bashrc echo "Disabling file indexing." sudo balooctl disable +echo "Disable update notifications" +sudo zypper -nq remove plasma5-pk-updates if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy From f6f00fdce1f3f00775e8b399dc8813883af5bf90 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 14 Feb 2018 11:56:52 +0200 Subject: [PATCH 15/16] Provisioning: Win7-x86 - Add msvc14_x86 squish package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squish is required by RTA testing. Task-number: QTQAINFRA-1732 Change-Id: I8ab0b11ccc299cc0b10e59f99d1cf27c0cdd48b9 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/squishInstall.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c4d56e07..509eb93f 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -158,6 +158,9 @@ if($OSVersion -eq "Windows 7") $squishPackage = "msvc14" $squishPackage64bit = "msvc14_64" + echo "Installing $squishPackage" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage + if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { echo "Installing $squishPackage64bit" From b20224fe6002eb930f7921a4fe235662dd6055f7 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 21 Feb 2018 12:26:09 +0100 Subject: [PATCH 16/16] Uninstall aptdaemon/aptd before using apt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This removes various kinds of update notifiers that depend on aptd. Also gets rid of the problem that aptd may hold apt lock files. Task-number: QTQAINFRA-1755 Change-Id: I27dd6fef4720ef25a504d76a3da16d9bf45fb2f7 Reviewed-by: Sami Nurmenniemi Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index e0e1d1f1..1f2139c1 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -51,6 +51,19 @@ try sudo systemctl stop $service sudo systemctl disable $service done + + # aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) + for i in `seq 10`; do + echo attempting to remove aptdaemon + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true + # check that aptdaemon is no longer installed + which aptd > /dev/null || break + if [[ $i -eq 10 ]]; then + throw $ExceptionAPT + fi + sleep 10 + done + # Git is not needed by builds themselves, but is nice to have # immediately as one starts debugging installPackages+=(git)