From 9494b39329c5785322351c8d6bc2fee30ef6e47e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 10 Mar 2018 22:47:04 +0100 Subject: [PATCH 01/13] Update submodules on '5.11' in qt5 Change-Id: Ia27a0de06afe5de52eb026a5225e4d2caac0975c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebglplugin | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 42a27f1a..028c3590 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 42a27f1a9ce319393a8e10a5f91b336e69fe2eb6 +Subproject commit 028c35909c38f0e47a5ab25fc1be14a4394ae4c5 diff --git a/qtbase b/qtbase index 3d53cf97..1e272199 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3d53cf976dc41d136c0508ec05fa757fcf27f71b +Subproject commit 1e27219968f760501c99f9f744f172d475a57162 diff --git a/qtconnectivity b/qtconnectivity index 0a97e6cd..24a07f0a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0a97e6cd908995699793b8513d3c7ef8020c2e32 +Subproject commit 24a07f0a94a0ac036866c18ef415f06dd1fb8bbe diff --git a/qtdatavis3d b/qtdatavis3d index be7e45ca..8a053119 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit be7e45ca259d70d5f2ef0d11460261146fc1df95 +Subproject commit 8a053119642986f8163b749c3c4f6a81a664509c diff --git a/qtdeclarative b/qtdeclarative index 6b310e5f..4838687e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6b310e5f9a53c366fbb8fb78bd7c343aad4e0cdd +Subproject commit 4838687eaa63de6e4d6821f14cf865a13af9ebc1 diff --git a/qtlocation b/qtlocation index a692e596..d7df0fa2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a692e59631bb1e8e0d4c0de8d2d6e68ca1c6cb60 +Subproject commit d7df0fa2952e3a00032ff50b0dc10ad93be57f54 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 923e7c26..031a1e89 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 923e7c26fde2bc42d04902441691b7f7667460a7 +Subproject commit 031a1e89e1baa952225c0f036b605f591f554e9b diff --git a/qtremoteobjects b/qtremoteobjects index 93dc5555..ec564258 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 93dc5555a7f815f4366886e3af57718c4c169fcb +Subproject commit ec564258e7f990e698cffa181f6e75cb359fa571 diff --git a/qttools b/qttools index dc10d71b..863178be 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dc10d71b180a4ac55dcf62a03f627183ce611c31 +Subproject commit 863178beafc1ab903f1425d56a3e591f4c29cb4e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c1bc3573..7683c588 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c1bc35736503e5ceaee1991745eb5a43a013be40 +Subproject commit 7683c588600fb23f774cbdbb4aacb4dd44d073e8 diff --git a/qtwayland b/qtwayland index e3bc3877..7ce033cb 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e3bc3877d667bc6b16e9790c35e2819ce421bd84 +Subproject commit 7ce033cbf9a80d2ea5d687956da668cf4567d361 diff --git a/qtwebglplugin b/qtwebglplugin index d73338df..a4e460a0 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit d73338df3809c8551f387c7192725683d52746d8 +Subproject commit a4e460a01f1962317093a5fb2170c869aead954a From 8fae7aa66de2a8e632032e5024fc4bbb01459b56 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 13 Mar 2018 14:59:51 +0100 Subject: [PATCH 02/13] Update submodules on '5.11' in qt5 Change-Id: I8234b4d7d7c54ed0020e6cd2fcdbaa07d33eb928 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 028c3590..d6f62cc4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 028c35909c38f0e47a5ab25fc1be14a4394ae4c5 +Subproject commit d6f62cc4ca72ee97711b47425fbcda988a8de83e diff --git a/qtbase b/qtbase index 1e272199..0e37558b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1e27219968f760501c99f9f744f172d475a57162 +Subproject commit 0e37558b6edd0cbdfa2a3bc8d67d9170c7917d7f diff --git a/qtdeclarative b/qtdeclarative index 4838687e..f0f632c7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4838687eaa63de6e4d6821f14cf865a13af9ebc1 +Subproject commit f0f632c7c1043f9c8097b4677f0a9eae01f916d2 diff --git a/qtquickcontrols b/qtquickcontrols index 94988415..71005834 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 949884153ae14724c30f17c75656aa0c6f072559 +Subproject commit 710058343297bba7cc44fa2369b7cec742f34cb2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 031a1e89..a8766caf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 031a1e89e1baa952225c0f036b605f591f554e9b +Subproject commit a8766caf09132bc08b7bc7eb3200607e2175d89d diff --git a/qttools b/qttools index 863178be..c003a913 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 863178beafc1ab903f1425d56a3e591f4c29cb4e +Subproject commit c003a913e3dd71835577a8bba327007e8f3d06f8 diff --git a/qtwayland b/qtwayland index 7ce033cb..6d9ee7d4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7ce033cbf9a80d2ea5d687956da668cf4567d361 +Subproject commit 6d9ee7d4c1a03eb2a3b51f2338e39be9f2c0b3ed diff --git a/qtwebengine b/qtwebengine index 1bda2052..7863f88b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1bda20527b2c880e3f88926605ea37f9b67de26e +Subproject commit 7863f88b71dc2f17c35dc2070adeebd7b891c599 diff --git a/qtwebview b/qtwebview index fa66026b..a499bd8b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fa66026beafaf00aa549f71d6879320610d0e7e5 +Subproject commit a499bd8b96715912948fbfe1ae435dc325c9d170 From 8a47814c91828a2f1541b99b58c8ee2eb085cb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 22 Feb 2018 15:00:47 +0100 Subject: [PATCH 03/13] Simplify DownloadURL The script was over-engineered. The new version provides the same functionality while removing uninteresting postmortem messages. In addition try_catch.sh has a bug that injects set +e to a sourcing script which was propagating through DownloadURL.sh to almost all provisioning scripts. So it is good to avoid using it. Change-Id: If191a0dcf52a29c4bec580a254e8e58a00130f6d Reviewed-by: Oliver Wolff Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/unix/DownloadURL.sh | 46 ++++---------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index d3a8a7d0..c1e1d6cc 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -40,51 +40,21 @@ # If called directly from another script, it will exit the parent script # as well, if not called in its own subshell with parentheses. -# shellcheck source=try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" - -ExceptionDownloadPrimaryUrl=100 -ExceptionDownloadAltUrl=101 -ExceptionSHA1=102 - function DownloadURL { url=$1 url_alt=$2 expectedSha1=$3 targetFile=$4 - 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 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl - ;; - esac - } - echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" > $targetFile.sha1 - sha1sum --check $targetFile.sha1 || throw $ExceptionSHA1 + echo "Downloading from primary URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || ( + echo "Failed to download '$url' multiple times" + echo "Downloading from alternative URL '$url_alt'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" ) - catch || { - case $ex_code in - $ExceptionDownloadAltUrl) - echo "Failed downloading PKG from primary and alternative URLs" - exit 1; - ;; - $ExceptionSHA1) - echo "Failed checksum on $targetFile." - exit 1; - ;; - esac - } + echo "Checking SHA1 on PKG '$targetFile'" + echo "$expectedSha1 *$targetFile" > $targetFile.sha1 + sha1sum --check $targetFile.sha1 } From 280b08eb730243534277265a87d8c647fafc78ab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Mar 2018 03:01:33 +0200 Subject: [PATCH 04/13] Update submodules on '5.11' in qt5 Change-Id: I6a0ad20fa97dabfbec8eaed990e844b26b20b353 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qttools | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 0e37558b..8eb3944d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0e37558b6edd0cbdfa2a3bc8d67d9170c7917d7f +Subproject commit 8eb3944dac81b8c51d7bac7784204d457551b50c diff --git a/qtdeclarative b/qtdeclarative index f0f632c7..5b1538d1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f0f632c7c1043f9c8097b4677f0a9eae01f916d2 +Subproject commit 5b1538d1c0b408bb54786336f2e59c208686edb2 diff --git a/qtlocation b/qtlocation index d7df0fa2..f93c464f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d7df0fa2952e3a00032ff50b0dc10ad93be57f54 +Subproject commit f93c464f7b0f2b3223a4d17cb52f6b5f4a6b0002 diff --git a/qttools b/qttools index c003a913..71da16ff 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c003a913e3dd71835577a8bba327007e8f3d06f8 +Subproject commit 71da16ff2397f29cfaa8c0a395b278d48515552d diff --git a/qtwebengine b/qtwebengine index 7863f88b..789f3754 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7863f88b71dc2f17c35dc2070adeebd7b891c599 +Subproject commit 789f375411b542db3ac3be79cbe0a6153720abf1 diff --git a/qtxmlpatterns b/qtxmlpatterns index c892ceec..bba31cef 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c892ceec1c301f12d5c276e12be0bee8fd7d4cbf +Subproject commit bba31cef71694feba0248a37edc1c843a9405ce4 From 237b308d47c47a6959ec559e0efd2cf1b525ba3a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 14 Mar 2018 10:04:31 +0200 Subject: [PATCH 05/13] Provisioning: Fix adb process name for android sdk installation There's no process called "adb.exe" - It's called "adb" Change-Id: I3c23ede12a6d7fc7f3f33bbb806a84e8d9a2aaf4 Reviewed-by: Oliver Wolff --- coin/provisioning/common/windows/android.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 881d057e..2048d6a9 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -91,7 +91,7 @@ SdkUpdate $sdkFolder platform-tools SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion # kill adb. This process prevents provisioning to continue -$p = Get-Process -Name "adb.exe" -ErrorAction:SilentlyContinue +$p = Get-Process -Name "adb" -ErrorAction:SilentlyContinue if ($p -ne $null) { Write-Host "Stopping adb.exe" Stop-Process -Force $p From 23b4bcf6c5773f1499e89b132e87e4d0333676a7 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 12 Mar 2018 14:51:29 +0200 Subject: [PATCH 06/13] Provisioning: Move http_proxy.txt under shared folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id5b2f07a92eadfb21fbfdb3fb65621d6322dc8c4 Reviewed-by: Tony Sarajärvi Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/{ => shared}/http_proxy.txt | 0 coin/provisioning/common/unix/check_and_set_proxy.sh | 2 +- coin/provisioning/common/windows/set-proxy.ps1 | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename coin/provisioning/common/{ => shared}/http_proxy.txt (100%) diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/shared/http_proxy.txt similarity index 100% rename from coin/provisioning/common/http_proxy.txt rename to coin/provisioning/common/shared/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 38905d56..c39c7d4b 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%/*}/../shared/http_proxy.txt" try ( diff --git a/coin/provisioning/common/windows/set-proxy.ps1 b/coin/provisioning/common/windows/set-proxy.ps1 index 2b985b09..23c0e6aa 100644 --- a/coin/provisioning/common/windows/set-proxy.ps1 +++ b/coin/provisioning/common/windows/set-proxy.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -$n = Get-Content "$PSScriptRoot\..\http_proxy.txt" +$n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] From 400371fabad0df0043b6e69cfc7f62dbbc7603ab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Mar 2018 20:17:58 +0100 Subject: [PATCH 07/13] Update submodules on '5.11' in qt5 Change-Id: I9ad2fe2d1bad7d761b25de77d473994870aac960 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 8eb3944d..8edc08ef 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8eb3944dac81b8c51d7bac7784204d457551b50c +Subproject commit 8edc08ef78202f42f373efc6f0814744b01eac9a diff --git a/qtdeclarative b/qtdeclarative index 5b1538d1..b1243b8c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5b1538d1c0b408bb54786336f2e59c208686edb2 +Subproject commit b1243b8c9ea0add1b7548428c8b0fcb8ee3ac71a diff --git a/qttools b/qttools index 71da16ff..5f00c476 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 71da16ff2397f29cfaa8c0a395b278d48515552d +Subproject commit 5f00c4762b0aaa15c700b896398e3f94a85769b1 diff --git a/qtwayland b/qtwayland index 6d9ee7d4..c5b6bec8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6d9ee7d4c1a03eb2a3b51f2338e39be9f2c0b3ed +Subproject commit c5b6bec872b2f22ec7b8d749d5f72b5ed0c4ddd4 diff --git a/qtwebengine b/qtwebengine index 789f3754..29a9f9d6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 789f375411b542db3ac3be79cbe0a6153720abf1 +Subproject commit 29a9f9d6e4ad9ffee62d3633edb17c1be335203e From 209cb73a363d794ad312e28f9ea38bb8ef8b47bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 9 Mar 2018 14:21:52 +0200 Subject: [PATCH 08/13] Use local RHEL repositories with RHEL 7.4 This will remove the majority of our network traffic from the outbound connection while provisioning. Also proxy was removed for yum, as there is no point in proxying local data. As a side effect, this makes provisioning currently faster by reducing the time it takes by 35%. Task-number: QTQAINFRA-1849 Change-Id: Ida4fb86d4bef166fc72e521e395d9753ec47a687 Reviewed-by: Timo Aarnipuro Reviewed-by: Sami Nurmenniemi Reviewed-by: Heikki Halmet --- .../01-systemsetup.sh | 5 --- .../02-enable-repos.sh | 32 ++++++++++++++++++- .../03-install-devtoolset.sh | 1 - 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index bf97a166..85ceaa24 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -36,7 +36,6 @@ set -ex BASEDIR=$(dirname "$0") -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" source $BASEDIR/../common/shared/network_test_server_ip.txt echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" @@ -50,7 +49,3 @@ export DISPLAY=:0 gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 - -if [ "$http_proxy" != "" ]; then - echo "proxy=$proxy" | sudo tee -a /etc/yum.conf -fi 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 8f080992..1f9ddb22 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,4 +35,34 @@ set -ex -sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms +sudo subscription-manager config --rhsm.manage_repos=0 +sudo subscription-manager refresh + +sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <> ~/.bashrc From eebc0133f00f15d6166de7fe74f0f30bc3af50a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 14 Mar 2018 12:49:12 +0200 Subject: [PATCH 09/13] Disable update download in background MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1852 Change-Id: I6d8e433fa40dd080fe84efcf3d0c655d14f86010 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/disable_update_downloads.sh | 3 +++ .../qtci-macos-10.12-x86_64/06-disable_update_downloads.sh | 4 ++++ .../qtci-osx-10.10-x86_64/06-disable_update_downloads.sh | 4 ++++ .../qtci-osx-10.11-x86_64/06-disable_update_downloads.sh | 4 ++++ 4 files changed, 15 insertions(+) create mode 100755 coin/provisioning/common/macos/disable_update_downloads.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh create mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh diff --git a/coin/provisioning/common/macos/disable_update_downloads.sh b/coin/provisioning/common/macos/disable_update_downloads.sh new file mode 100755 index 00000000..095926a6 --- /dev/null +++ b/coin/provisioning/common/macos/disable_update_downloads.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE + diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh new file mode 100755 index 00000000..3c11214d --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/disable_update_downloads.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh new file mode 100755 index 00000000..3c11214d --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/disable_update_downloads.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh new file mode 100755 index 00000000..3c11214d --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/disable_update_downloads.sh From 64c79b27d6457235a30dd124382b004d37d4c089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 16 Mar 2018 14:06:35 +0200 Subject: [PATCH 10/13] Clean old RHEL repo data before fetching new data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1872 Change-Id: I49d9d1589adc5b34f1b7c2dccc14be0021f2baaa Reviewed-by: Sami Nurmenniemi Reviewed-by: Heikki Halmet Reviewed-by: Simo Fält Reviewed-by: Joni Jäntti --- .../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 1f9ddb22..cd0f3dc2 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 @@ -66,3 +66,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release enabled = 1 gpgcheck = 1 EOC + +sudo yum clean all +# As well as this fetching the repository data, we also get a printout of the used repos +sudo yum repolist From 863252be498028c589c08ba23a70eb9cd92b1416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sun, 18 Mar 2018 14:50:13 +0200 Subject: [PATCH 11/13] Download get-pip primarily from our local cache We should first download from our local cache, and if that doesn't work, fetch it online. This commit doesn't fix it per se, but as we download it from our local cache, the version is the one our shasum checksum matches against. Task-number: QTQAINFRA-1876 Change-Id: Ia7de54cf090af47ba33111911582f9d48c0ab2a2 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 41f181b2..4e75633d 100755 --- 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 @@ -47,7 +47,7 @@ OfficialUrlPip="https://bootstrap.pypa.io/$packagePip" CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip" SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d" -DownloadURL $OfficialUrlPip $CachedUrlPip $SHA1Pip ./$packagePip +DownloadURL $CachedUrlPip $OfficialUrlPip $SHA1Pip ./$packagePip sudo python3 $packagePip sudo rm -f $packagePip sudo pip3 install virtualenv From 85f874388cad89f4b66b28d7612a7a630d78911c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sat, 17 Mar 2018 11:24:17 +0000 Subject: [PATCH 12/13] Revert "Provisioning: openSUSE - Set grub timeout to 0" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2e329bc68eb5af977dca1982ed608dc058fdf7f9. grub-update command isn't found, and after enforcing script results, we have a P0 blocker here. Change-Id: Iaf4b17a91cdc865974a5f4f196bbb80b085a39c2 Reviewed-by: Heikki Halmet (cherry picked from commit 677524620d5e8a8af96fa9395e3b3d342f113158) Reviewed-by: Joni Jäntti Reviewed-by: Liang Qi --- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 3 --- 1 file changed, 3 deletions(-) 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 f53a2943..053adfe1 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 @@ -7,9 +7,6 @@ source $BASEDIR/../common/shared/network_test_server_ip.txt source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc -echo "Set grub timeout to 0" -sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub -sudo update-grub echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts From 5d7972b73b695e390b9bd3d82d7b6089b2ce84a2 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 16 Mar 2018 14:24:19 +0200 Subject: [PATCH 13/13] Provisioning: Windows - Disable autoreboot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows machines currently reboot automatically in case of a blue screen crash. This must be disabled to prevent problems with Coin. Task-number: QTQAINFRA-1748 Change-Id: I64ac1cfa124694fab356b8443298c1b37bed9a92 Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-autoreboot.ps1 | 35 +++++++++++++++++++ .../02-disable-autoreboot.ps1 | 1 + .../02-disable-autoreboot.ps1 | 1 + .../02-disable-autoreboot.ps1 | 1 + .../02-disable-autoreboot.ps1 | 1 + .../02-disable-autoreboot.ps1 | 1 + .../02-disable-autoreboot.ps1 | 1 + 7 files changed, 41 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-autoreboot.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/02-disable-autoreboot.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-autoreboot.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/02-disable-autoreboot.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/02-disable-autoreboot.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-autoreboot.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/02-disable-autoreboot.ps1 diff --git a/coin/provisioning/common/windows/disable-autoreboot.ps1 b/coin/provisioning/common/windows/disable-autoreboot.ps1 new file mode 100644 index 00000000..2184a7aa --- /dev/null +++ b/coin/provisioning/common/windows/disable-autoreboot.ps1 @@ -0,0 +1,35 @@ +############################################################################ +## +## 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$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +Get-WmiObject Win32_OSRecoveryConfiguration -EnableAllPrivileges | Set-WmiInstance -Arguments @{ AutoReboot=$False } diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-autoreboot.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-autoreboot.ps1 new file mode 100644 index 00000000..73430b76 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-autoreboot.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-autoreboot.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-autoreboot.ps1 new file mode 100644 index 00000000..73430b76 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-autoreboot.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-autoreboot.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-autoreboot.ps1 new file mode 100644 index 00000000..73430b76 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/02-disable-autoreboot.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/02-disable-autoreboot.ps1 b/coin/provisioning/qtci-windows-7-x86_64/02-disable-autoreboot.ps1 new file mode 100644 index 00000000..73430b76 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/02-disable-autoreboot.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-autoreboot.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-autoreboot.ps1 new file mode 100644 index 00000000..73430b76 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-autoreboot.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-autoreboot.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-autoreboot.ps1 new file mode 100644 index 00000000..73430b76 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-autoreboot.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1"