From 2e329bc68eb5af977dca1982ed608dc058fdf7f9 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 30 Jan 2018 12:22:32 +0200 Subject: Provisioning: openSUSE - Set grub timeout to 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Grub timeout should be set to 0 so we save some time whenever the VMs are booted. Task-number: QTQAINFRA-1703 Change-Id: I67db00d200dc3e5f94ed205b53bb0ca6e70bdd8d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin') 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 4ebc1b44..d76364a8 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,6 +7,9 @@ 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 -- cgit v1.2.3 From 9fa8b3ca357a63e5bbb296beadee3c83357fa1cf Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 2 Feb 2018 11:19:35 +0200 Subject: Provisioning: openSUSE - Disable file indexing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Baloo file indexing sometimes takes up a great amount of CPU capacity and should therefore be disabled. Task-number: QTQAINFRA-1702 Change-Id: I549aef39c1dd2d2fa97196910f577153a42c4f54 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'coin') 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 d76364a8..d5439f0e 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 @@ -15,6 +15,8 @@ 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 echo "Set DISPLAY" echo 'export DISPLAY=":0"' >> ~/.bashrc +echo "Disabling file indexing." +sudo balooctl disable if [ "$proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy -- cgit v1.2.3 From 38649924dfc0a6da0a6a5573b95511191ae44310 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 30 Jan 2018 12:11:58 +0200 Subject: Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Grub timeout should be set to 0 so we save some time whenever the VMs are booted. Task-number: QTQAINFRA-1703 Change-Id: Ia866000703fdc083407d5d8588ba6680ffd80038 Reviewed-by: Tony Sarajärvi --- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 6c198b1d..76277f02 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -47,6 +47,7 @@ ExceptionGsettings2=101 ExceptionGsettings3=102 ExceptionNTS=103 ExceptionProxy=104 +ExceptionGrub=105 try ( @@ -58,6 +59,9 @@ try gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2 echo "Disable questions on shutdown." gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3 + echo "Set grub timeout to 0" + sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub || throw $ExceptionGrub + sudo update-grub || throw $ExceptionGrub echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS @@ -84,6 +88,10 @@ catch || { echo "Failed to disable questions on shutdown." exit 1; ;; + $ExceptionGrub) + echo "Failed to set grub timeout." + exit 1; + ;; $ExceptionNTS) echo "Failed to set network teset server address into /etc/hosts." exit 1; -- cgit v1.2.3 From b4b62658ac231dbcc17360dcc946117d1be39ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 30 Jan 2018 23:52:33 +0200 Subject: Fix environment variable checking for proxy Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51 Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/android_linux.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 76db19d4..a7b83fd7 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -88,7 +88,7 @@ try fi echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - if [ "$proxy" != "" ]; then + if [ "$http_proxy" != "" ]; then proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo $proxy | cut -d':' -f3) echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh index 90b32d0d..fc07e6fa 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -37,6 +37,6 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" -if [ "$proxy" != "" ]; then +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/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index a7718d96..bf97a166 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 @@ -51,6 +51,6 @@ gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 -if [ "$proxy" != "" ]; then +if [ "$http_proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf fi diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 76277f02..e00e2498 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -66,7 +66,7 @@ try echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS - if [ "$proxy" != "" ]; then + if [ "$http_proxy" != "" ]; then echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy fi ) 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 d5439f0e..c0e7b8e9 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 @@ -18,7 +18,7 @@ echo 'export DISPLAY=":0"' >> ~/.bashrc echo "Disabling file indexing." sudo balooctl disable -if [ "$proxy" != "" ]; then +if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy fi -- cgit v1.2.3 From c3096caa14393690df2d6bdb79b144924c56f22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 1 Feb 2018 08:32:35 +0200 Subject: Remove excess comment line for shellcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/cmake_linux.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 98af57c8..7154d822 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -37,7 +37,6 @@ # CMake is needed for autotests that verify that Qt can be built with CMake -# shellcheck source=InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -- cgit v1.2.3 From af55ddc91349d408775bef8d29db7dabae7aef72 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 6 Feb 2018 14:58:42 +0200 Subject: Provisioning: MacOS-10.12 - Disable sleep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Display sleep and system sleep need to be disabled to prevent the machine from going to sleep during RTA testing. Task-number: QTQAINFRA-1588 Change-Id: I3dc1642d3714762bfb56963392d2bb5137c13256 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'coin') diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index 20430d6a..6420efe7 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -49,6 +49,7 @@ ExceptionSetDelay=102 ExceptionVNC=103 ExceptionNTS=104 ExceptionDisableScreensaverPassword=105 +ExceptionDisableSleep=106 try ( @@ -56,6 +57,9 @@ try # For current session defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver + echo "Disable sleep" + sudo pmset sleep 0 displaysleep 0 || throw $ExceptionDisableSleep + # For session after a reboot mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver ( @@ -126,5 +130,10 @@ catch || { echo "Failed to disable requiring of password after screensaver is enabled." exit 1; ;; + $ExceptionDisableSleep) + echo "Failed to disable sleep." + exit 1; + ;; + esac } -- cgit v1.2.3 From cadedac3b4ae9ea0b7a500accf0d1e3eeae47bd9 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 6 Feb 2018 15:39:57 +0200 Subject: Provisioning: osx-10.11 - Disable sleep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Display sleep and system sleep need to be disabled to prevent the machine from going to sleep during RTA testing. Task-number: QTQAINFRA-1588 Change-Id: Idc91d77388ed9bc6df5f3c1aceca515f6308c618 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'coin') diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh index 5cb067a7..994dedf4 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh @@ -49,6 +49,7 @@ ExceptionSetDelay=102 ExceptionVNC=103 ExceptionNTS=104 ExceptionDisableScreensaverPassword=105 +ExceptionDisableSleep=106 try ( @@ -56,6 +57,9 @@ try # For current session defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver + echo "Disable sleep" + sudo pmset sleep 0 displaysleep 0 || throw $ExceptionDisableSleep + # For session after a reboot mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver ( @@ -126,6 +130,11 @@ catch || { echo "Failed to disable requiring of password after screensaver is enabled." exit 1; ;; + $ExceptionDisableSleep) + echo "Failed to disable sleep." + exit 1; + ;; + esac } -- cgit v1.2.3 From 769a34ed26589702623fe41aeac72527c3e7c210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 7 Feb 2018 13:52:55 +0200 Subject: Provision: Use specific Python2 version in macOS Make sure we use some specific Python2 version on macOS instead of the one pre-installed along with system. Change-Id: Ifee07a8cf003e282ec3cb67535818f9fe39c8679 Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/python2.sh | 52 ++++++++++++++++++++++ .../qtci-macos-10.12-x86_64/25-python2.sh | 4 ++ .../qtci-osx-10.10-x86_64/25-python2.sh | 4 ++ .../qtci-osx-10.11-x86_64/25-python2.sh | 4 ++ 4 files changed, 64 insertions(+) create mode 100755 coin/provisioning/common/macos/python2.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh create mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh (limited to 'coin') diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh new file mode 100755 index 00000000..fbebee42 --- /dev/null +++ b/coin/provisioning/common/macos/python2.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs python2 + +source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" +SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +/Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv + +SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" + +echo "python2 = 2.7.14" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh new file mode 100755 index 00000000..ef65edad --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex + +source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh new file mode 100755 index 00000000..ef65edad --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex + +source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh new file mode 100755 index 00000000..ef65edad --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex + +source "${BASH_SOURCE%/*}/../common/macos/python2.sh" -- cgit v1.2.3 From 404805141a615777a51906c57c9850a7bda3f729 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 9 Feb 2018 15:33:25 +0200 Subject: Disable set -e when enabling devtoolset-4 environment variables Change-Id: If427179da490f14963077cd733082258e354710f Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh index b685362e..9b0cd0f6 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh @@ -32,6 +32,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# +set +e source /opt/rh/devtoolset-4/enable -- cgit v1.2.3