Merge remote-tracking branch 'origin/5.9' into 5.9.4

This merge wasn't done during final downmerge from '5.9' -> '5.9.4'

Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0

coin/platform_configs/default.txt

@@ -7,8 +7,8 @@ qtci-windows-10-x86_64-10                               x86         MSVC2015
 qtci-windows-10-x86_64-10                                           MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
+qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
 qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
 qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
@@ -18,8 +18,8 @@ qtci-osx-10.11-x86_64-3                                             Clang
 qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
 qtci-macos-10.12-x86_64-8           IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64-1    QEMU                armv7       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                armv7       GCC         Release
-qtci-linux-Ubuntu-16.04-x86_64-1    QEMU                arm64       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                arm64       GCC         Release
-qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         TestOnly LicenseCheck
+qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         TestOnly LicenseCheck
 qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-RHEL-7.4-x86_64          INTEGRITY_11_04     armv7       GCC         Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qtbase.txt

@@ -1,4 +1,4 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                armv7       GCC         DeveloperBuild DisableTests
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                armv7       GCC         DeveloperBuild DisableTests
-qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                arm64       GCC         DeveloperBuild DisableTests
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                arm64       GCC         DeveloperBuild DisableTests

coin/platform_configs/qtdeclarative.txt

@@ -1,4 +1,4 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                armv7       GCC         DeveloperBuild
-qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                arm64       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                arm64       GCC         DeveloperBuild

coin/provisioning/common/DownloadURL.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/InstallFromCompressedFileFromURL.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/InstallPKGFromURL.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/android_linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -39,6 +39,7 @@
 
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
@@ -79,10 +80,20 @@ try
     rm "$toolsTargetFile" || throw $ExceptionRmTools
 
     echo "Changing ownership of Android files."
-    sudo chown -R qt:wheel "$targetFolder"
+    if uname -a |grep -q "el6\|el7"; then
+        sudo chown -R qt:wheel "$targetFolder"
+    else
+        sudo chown -R qt:users "$targetFolder"
+    fi
 
     echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+    if [ "$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
+    else
+        echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+    fi
 
     echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
     echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc

coin/provisioning/common/check_and_set_proxy.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/http_proxy.txt"
+
+try
+(
+  wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io
+)
+
+if [ $? -eq 0 ]; then
+    echo "Setting http_proxy to $proxy"
+    export http_proxy=$proxy
+
+else
+    echo "Proxy not detected at $proxy"
+fi
+

coin/provisioning/common/cmake.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/cmake_linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/fbx_linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/fbx_macos.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.

coin/provisioning/common/http_proxy.txt

@@ -0,0 +1,2 @@
+proxy="http://proxy.intra.qt.io:3128"
+

coin/provisioning/common/icu.ps1

@@ -39,29 +39,12 @@ $version = "53_1"
 
 if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
 
-   $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z"
-   $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z"
-   $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC"
-
    $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z"
    $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z"
    $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F"
 
-   $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z"
    $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
 
-   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) {
-      echo "Fetching from URL ..."
-      Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64
-      Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012
-      Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""}
-
-      echo "Cleaning $icuPackage_msvc2012_64..."
-      Remove-Item -Recurse -Force $icuPackage_msvc2012_64
-
-      echo "ICU MSVC2012 = $version" >> ~\versions.txt
-   }
-
    if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
       echo "Fetching from URL ..."
       Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
@@ -75,7 +58,6 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
    }
 
 # FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
 [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
 
 # FIXME: do we really want to use the 4.8.2 ICU build?
@@ -83,29 +65,12 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
 
 } else {
 
-   $url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z"
-   $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z"
-   $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0"
-
    $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z"
    $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z"
    $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800"
 
-   $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z"
    $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
 
-   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) {
-      echo "Fetching from URL ..."
-      Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32
-      Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32
-      Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""}
-
-      echo "Cleaning $icuPackage_msvc2012_32..."
-      Remove-Item -Recurse -Force $icuPackage_msvc2012_32
-
-      echo "ICU MSVC2012 = $version" >> ~\versions.txt
-   }
-
    if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
       echo "Fetching from URL ..."
       Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
@@ -119,7 +84,6 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
    }
 
 # FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine")
 [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
 
 }

coin/provisioning/common/install-commandlinetools.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/install_xcode.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/integrity.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/libclang.sh

@@ -40,6 +40,8 @@
 # In case of Linux, we expect to get the values as args
 set -e
 
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/sw_versions.txt
 url=$1

coin/provisioning/common/openssl_for_android_linux.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/python3.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/qnx_700.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/system_updates.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/try_catch.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/version.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh

@@ -0,0 +1,42 @@
+#!/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/check_and_set_proxy.sh"
+
+if [ "$proxy" != "" ]; then
+    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
+fi

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh

@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
 # provides: fix for possible bug in the subscription manager
 # version: provided by RedHat
 # needed for yum to work properly in case there is incorrect data in
 # the sslclientkey repository parameter value
+
+set -ex
+
 sudo rm -f /etc/pki/entitlement/*
 sudo subscription-manager refresh

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh

@@ -1,4 +1,8 @@
+#!/usr/bin/env bash
 # provides: odbc devel packages on RHEL
 # version: provided by default Linux distribution repository
 # needed for configure -plugin-sql-odbc in qtbase
+
+set -ex
+
 sudo yum install -y unixODBC-devel

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/sw_versions.txt
 VERSION=$libclang_version

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh

@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
 # provides: python development libraries
 # version: provided by default Linux distribution repository
 # needed to build pyside
+
+set -ex
+
 sudo yum install -y python-devel python-virtualenv
 
 # install the EPEL repository which provides python3

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh

@@ -1 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
 $(dirname $0)/../common/cmake_linux.sh

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh

@@ -1,3 +1,6 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 # Required for tqtc-boot2qt/qdb
+
+set -ex
+
 sudo yum install -y libusb1-devel

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -36,6 +36,9 @@
 # This script needs to be called last during provisioning so that the software information will show up last in provision log.
 
 # Storage installed RPM packages information
+
+set -ex
+
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
 rpm -q -a | sort >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,6 +33,8 @@
 ##
 #############################################################################
 
+set -ex
+
 # refresh local certificates
 sudo subscription-manager refresh
 

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,10 +33,11 @@
 ##
 #############################################################################
 
-set -e
+set -ex
 
 BASEDIR=$(dirname "$0")
 source $BASEDIR/../common/network_test_server_ip.txt
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 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
@@ -49,3 +50,7 @@ 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 [ "$proxy" != "" ]; then
+    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
+fi

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh

@@ -0,0 +1,38 @@
+#!/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
+
+sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,6 +33,8 @@
 ##
 #############################################################################
 
+set -ex
+
 sudo yum-config-manager --enable rhel-server-rhscl7-rpms
 sudo yum -y install devtoolset-4
 

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,7 +33,7 @@
 ##
 #############################################################################
 
-set -e
+set -ex
 
 installPackages=()
 installPackages+=(git)

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -32,6 +32,9 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
 
 name="p7zip"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -ex
 
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/sw_versions.txt

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,6 +35,8 @@
 
 # This script installs CMake 3.6.2
 
+set -ex
+
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
 source "${BASH_SOURCE%/*}/../common/cmake_linux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/qnx_700.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/integrity.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,10 +33,10 @@
 ##
 #############################################################################
 
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
-
 set -ex
 
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
 packageEpel="epel-release-latest-7.noarch.rpm"
 OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel"
 CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/disable_selinux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh

@@ -0,0 +1,40 @@
+#!/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$
+##
+#############################################################################
+
+source /opt/rh/devtoolset-4/enable
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh

@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+set -ex
 
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/fbx_linux.sh

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh

@@ -0,0 +1,38 @@
+#!/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/android_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -36,7 +36,11 @@
 # This script modifies system settings for automated use
 
 # shellcheck source=../common/try_catch.sh
+
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 NTS_IP=10.212.2.216
 
@@ -44,6 +48,7 @@ ExceptionGsettings1=100
 ExceptionGsettings2=101
 ExceptionGsettings3=102
 ExceptionNTS=103
+ExceptionProxy=104
 
 try
 (
@@ -56,6 +61,10 @@ 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
+        echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy
+    fi
 )
 catch || {
     case $ex_code in
@@ -75,6 +84,10 @@ catch || {
             echo "Failed to set network teset server address into /etc/hosts."
             exit 1;
         ;;
+        $ExceptionProxy)
+            echo "Failed to set proxy /etc/apt/apt.conf."
+            exit 1;
+        ;;
     esac
 }
 

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,6 +35,8 @@
 
 # Install required packages with APT
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 
 ExceptionAPTUpdate=100
@@ -49,47 +51,103 @@ try
         sudo systemctl stop $service
         sudo systemctl disable $service
     done
+    # Git is not needed by builds themselves, but is nice to have
+    # immediately as one starts debugging
+    installPackages+=(git)
+    # 7zip is a needed decompressing tool
+    installPackages+=(p7zip)
+    # libssl-dev provides headers for OpenSSL
+    installPackages+=(libssl-dev)
+    # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git
+    installPackages+=("^libxcb.*")
+    installPackages+=(libxkbcommon-dev)
+    installPackages+=(libxkbcommon-x11-dev)
+    installPackages+=(libx11-xcb-dev)
+    installPackages+=(libglu1-mesa-dev)
+    installPackages+=(libxrender-dev)
+    installPackages+=(libxi-dev)
+    # Enable linking to system dbus
+    installPackages+=(libdbus-1-dev)
+    # Needed libraries for WebEngine
+    installPackages+=(libudev-dev)
+    installPackages+=(libegl1-mesa-dev)
+    installPackages+=(libfontconfig1-dev)
+    installPackages+=(libxss-dev)
+    # Common event loop handling
+    installPackages+=(libglib2.0-dev)
+    # MySQL support
+    installPackages+=(libmysqlclient-dev)
+    # PostgreSQL support
+    installPackages+=(libpq-dev)
+    # SQLite support
+    installPackages+=(libsqlite3-dev)
+    # ODBC support
+    installPackages+=(unixodbc-dev)
+    # Support for FreeType font engine
+    installPackages+=(libfreetype6-dev)
+    # Enable the usage of system jpeg libraries
+    installPackages+=(libjpeg-dev)
+    # Enable support for printer driver
+    installPackages+=(libcups2-dev)
+    # Install libraries needed for QtMultimedia to be able to support all plugins
+    installPackages+=(libasound2-dev)
+    installPackages+=(libgstreamer1.0-dev)
+    installPackages+=(libgstreamer-plugins-base1.0-dev)
+    installPackages+=(libgstreamer-plugins-good1.0-dev)
+    installPackages+=(libgstreamer-plugins-bad1.0-dev)
+    # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
+    installPackages+=(g++-multilib)
+    # python3 development package
+    installPackages+=(python3-dev)
+    installPackages+=(python3-pip)
+    installPackages+=(python3-virtualenv)
+    # Automates interactive applications (Needed by RTA to automate configure testing)
+    installPackages+=(expect)
+    installPackages+=(mesa-common-dev)
+    installPackages+=(libgl1-mesa-glx)
+    installPackages+=(libgl1-mesa-dev)
+    installPackages+=(libegl1-mesa-dev)
+    installPackages+=(curl)
+    installPackages+=(libicu-dev)
+    installPackages+=(zlib1g-dev)
+    installPackages+=(zlib1g)
+    installPackages+=(openjdk-8-jdk)
+    installPackages+=(libgtk-3-dev)
+    installPackages+=(ninja-build)
+    installPackages+=(libssl-dev)
+    installPackages+=(libxcursor-dev)
+    installPackages+=(libxcomposite-dev)
+    installPackages+=(libxdamage-dev)
+    installPackages+=(libxrandr-dev)
+    installPackages+=(libfontconfig1-dev)
+    installPackages+=(libxss-dev)
+    installPackages+=(libsrtp0-dev)
+    installPackages+=(libwebp-dev)
+    installPackages+=(libjsoncpp-dev)
+    installPackages+=(libopus-dev)
+    installPackages+=(libminizip-dev)
+    installPackages+=(libavutil-dev)
+    installPackages+=(libavformat-dev)
+    installPackages+=(libavcodec-dev)
+    installPackages+=(libevent-dev)
+    installPackages+=(bison)
+    installPackages+=(flex)
+    installPackages+=(gperf)
+    installPackages+=(libasound2-dev)
+    installPackages+=(libpulse-dev)
+    installPackages+=(libxtst-dev)
+    installPackages+=(libnspr4-dev)
+    installPackages+=(libnss3-dev)
+    installPackages+=(libopenal-dev)
+    installPackages+=(libbluetooth-dev)
+    #VirtualBox for RTA
+    installPackages+=(virtualbox)
+    installPackages+=(dkms)
+
     echo "Running update for apt"
     sudo apt-get update
     echo "Installing packages"
-    # Git is not needed by builds themselves, but is nice to have
+    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" || throw $ExceptionAPT
-    # immediately as one starts debugging
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT
-    # 7zip is a needed decompressing tool
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT
-    # libssl-dev provides headers for OpenSSL
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT
-    # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT
-    # Enable linking to system dbus
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libdbus-1-dev || throw $ExceptionAPT
-    # Needed libraries for WebEngine
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT
-    # Common event loop handling
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT
-    # MySQL support
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT
-    # PostgreSQL support
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT
-    # SQLite support
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT
-    # ODBC support
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT
-    # Support for FreeType font engine
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT
-    # Enable the usage of system jpeg libraries
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT
-    # Enable support for printer driver
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT
-    # Install libraries needed for QtMultimedia to be able to support all plugins
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT
-    # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT
-    # python3 development package
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT
-    # Automates interactive applications (Needed by RTA to automate configure testing)
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install expect || throw $ExceptionAPT
 )
 catch || {
     case $ex_code in

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,7 +35,7 @@
 
 # This script installs the Yocto toolchain
 
-set -e
+set -ex
 
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
 

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh

@@ -34,4 +34,7 @@
 #############################################################################
 
 source /opt/rh/devtoolset-4/enable
+
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/fbx_linux.sh

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh

@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/android_linux.sh"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo zypper -nq install python-devel python-virtualenv
-
-# install python3
-sudo zypper -nq install python3 python3-pip python3-virtualenv

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh

@@ -1,8 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
-set -e
+
+set -ex
 
 BASEDIR=$(dirname "$0")
 source $BASEDIR/../common/network_test_server_ip.txt
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
 
@@ -11,3 +13,8 @@ echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | su
 echo "Set DISPLAY"
 echo 'export DISPLAY=":0"' >> ~/.bashrc
 
+if [ "$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
+

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh

@@ -1,5 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
-set -e
+
+set -ex
 
 sudo zypper -nq install git
 # default compiler, gcc 4.8.5

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/sw_versions.txt
 VERSION=$libclang_version

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
 # provides: python development libraries
 # version: provided by default Linux distribution repository
 # needed to build pyside
+
+set -ex
+
 sudo pkcon -y refresh
 sudo pkcon -y install python-devel python-virtualenv
 

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh

@@ -1,2 +1,5 @@
 #!/usr/bin/env bash
+
+set -ex
+
 $(dirname $0)/../common/cmake_linux.sh

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,7 +37,7 @@
 
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
 
-set -e
+set -ex
 
 mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input"
 localMount="/mnt/storage/"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh

@@ -0,0 +1,39 @@
+#!/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
+
+# Having proxy set while running autotests makes them fail
+sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy
+

coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh

@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
 
 # Read .bashrc if exist
 printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n        . ~/.bashrc\nfi\n" >> ~/.bash_profile

coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,6 +33,8 @@
 ##
 #############################################################################
 
+set -ex
+
 # This script modified system settings for automated use
 
 # shellcheck source=../common/try_catch.sh
@@ -126,4 +128,3 @@ catch || {
         ;;
     esac
 }
-

coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh

@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh

@@ -1,3 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 # Enables the usage of temporary keychains for SSL autotests
 echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc

coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # XZ-Utils are needed for uncompressing xz-compressed files
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -34,6 +34,9 @@
 #############################################################################
 
 # This script installs JDK
+
+set -ex
+
 echo "Installing Java Development Kit"
 
 # shellcheck source=../common/try_catch.sh

coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -42,6 +42,8 @@
 # This will give you a file called "Content.part00.cpio.xz" that
 # can be renamed to Xcode_8.xz for this script.
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -32,6 +32,9 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
 
 version="8.3.2"

coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/cmake.sh

coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/homebrew.sh

coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # MySQL is needed for Qt to be able to support MySQL
 
+set -ex
+
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/pip.sh

coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # PostgreSQL is needed for Qt to be able to support PostgreSQL
 
+set -ex
+
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh

@@ -1 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/python3.sh"

coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 # Install 7z to be used from command line
+
+set -ex
+
 brew update
 brew install p7zip

coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/virtualenv.sh

coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 # There is only one mac package and common script uses it as a default
 $BASEDIR/../common/libclang.sh

coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 
@@ -77,7 +79,7 @@ try
     sudo chown -R qt:wheel "$targetFolder"
 
     echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+    (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
 
     echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
     echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc

coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/fbx_macos.sh
 

coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,6 +35,8 @@
 
 # This script install OpenSSL
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 # shellcheck source=../common/InstallFromCompressedFileFromURL.sh

coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #############################################################################
 ##

coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh

@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/system_updates.sh

coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh

@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
 
 mkdir -p $HOME/Library/LaunchAgents
 cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT

coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh

@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
 
 # Read .bashrc if exist
 printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n        . ~/.bashrc\nfi\n" >> ~/.bash_profile

coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/cmake.sh

coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 # There is only one mac package and common script uses it as a default
 $BASEDIR/../common/libclang.sh

coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh

@@ -1 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/python3.sh"

coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh

@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/system_updates.sh

coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh

@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
 
 # Read .bashrc if exist
 printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n        . ~/.bashrc\nfi\n" >> ~/.bash_profile

coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,6 +35,8 @@
 
 # This script modified system settings for automated use
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 
@@ -126,3 +128,4 @@ catch || {
         ;;
     esac
 }
+