Update submodules on '5.9' in qt5

Change-Id: Ib3f84d5b2e24b827098d873016a012eb07ec18ca
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.11
+	branch = 5.9
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.11
+	branch = 5.9
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.11
+	branch = 5.9
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.11
+	branch = 5.9
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.11
+	branch = 5.9
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.11
+	branch = 5.9
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.11
+	branch = 5.9
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.11
+	branch = 5.9
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,108 +211,101 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
-	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.11
+	branch = 5.9
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.11
-	status = addon
+	branch = 5.9
+	status = preview
 [submodule "qtnetworkauth"]
 	depends = qtbase
+	recommends = qtwebview
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.11
-	status = addon
+	branch = 5.9
+	status = preview
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.11
-	status = preview
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = 5.11
+	branch = 5.9
 	status = preview

coin/platform_configs/default.txt

@@ -1,27 +1,25 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release DisableTests
 qtci-windows-10-x86_64-10                                           MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
 qtci-windows-7-x86-3                                                Mingw53     DeveloperBuild Release OpenGLDynamic
 qtci-windows-10-x86_64-10                               x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 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-windows-10-x86_64-10                                           MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         NoWidgets ForceDebugInfo
 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 SystemSQLite
+qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
 qtci-linux-RHEL-7.4-x86_64                                          GCC         Packaging Release NoUseGoldLinker
-qtci-macos-10.12-x86_64-8                                           Clang       Packaging DebugAndRelease Release
+qtci-macos-10.12-x86_64-9                                           Clang       Packaging DebugAndRelease Release
 qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
-qtci-osx-10.11-x86_64-3                                             Clang       Release NoFramework DisableTests
-qtci-macos-10.12-x86_64-8           IOS_ANY             multi       Clang       Release DisableTests Static
-qtci-macos-10.12-x86_64-8           TvOS_ANY            multi       Clang       Release DisableTests
-qtci-macos-10.12-x86_64-8           WatchOS_ANY         multi       Clang       Release DisableTests
+qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
+qtci-macos-10.12-x86_64-9           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-2    QEMU                armv7       GCC         Release
 qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                arm64       GCC         Release
 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
-qtci-linux-RHEL-7.4-x86_64          QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qt5.txt

@@ -1,7 +1,10 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-8.1-x86_64                         x86         MSVC2013    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8.1-x86_64                                     MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86-6                                       MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                   MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
@@ -9,14 +12,13 @@ qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017    Packagin
 qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   QNX_700             x86         GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
-qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
+qtci-macos-10.12-x86_64-9   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-9   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-macos-10.12-x86_64-9   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
 qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             x86         Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64  QNX_700             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qtwebkit.txt

@@ -1,4 +1,5 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                                   MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests

coin/platform_configs/tqtc-qt-rta.txt

@@ -1,5 +1,6 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-7-x86_64-4                                     MSVC2013    Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-10-x86-6                                       MSVC2017    Release ForceDebugInfo OpenGLDynamic
+qtci-windows-8.1-x86_64                                     MSVC2013    Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86-3                                       MSVC2017    Release ForceDebugInfo OpenGLDynamic
 

coin/provisioning/common/linux/android_linux.sh

@@ -37,7 +37,6 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
@@ -62,75 +61,37 @@ toolsSourceFile="$basePath/$toolsFile"
 ndkTargetFile="/tmp/$ndkFile"
 ndkSourceFile="$basePath/$ndkFile"
 
-ExceptionDownload=99
-ExceptionUnzipTools=100
-ExceptionUnzipNdk=101
-ExceptionRmTools=102
-ExceptionRmNdk=103
-ExceptionSdkManager=104
+DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
+DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
+echo "Unzipping Android NDK to '$targetFolder'"
+sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
+echo "Unzipping Android Tools to '$sdkTargetFolder'"
+sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
+rm "$ndkTargetFile"
+rm "$toolsTargetFile"
 
-try
-(
-    (DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile") || throw $ExceptionDownload
-    (DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile") || throw $ExceptionDownload
-    echo "Unzipping Android NDK to '$targetFolder'"
-    sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
-    echo "Unzipping Android Tools to '$sdkTargetFolder'"
-    sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
-    rm "$ndkTargetFile" || throw $ExceptionRmNdk
-    rm "$toolsTargetFile" || throw $ExceptionRmTools
+echo "Changing ownership of Android files."
+if uname -a |grep -q "el6\|el7"; then
+    sudo chown -R qt:wheel "$targetFolder"
+else
+    sudo chown -R qt:users "$targetFolder"
+fi
 
-    echo "Changing ownership of Android files."
-    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."
+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"
+else
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
+fi
 
-    echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
-    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
-    else
-        echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
-    fi
-
-    SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
-    SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
-    SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
-    SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
-
-    echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
-    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
-    echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
-    echo "Android NDK = $ndkVersion" >> ~/versions.txt
-)
-catch || {
-        case $ex_code in
-            $ExceptionDownload)
-                exit 1;
-            ;;
-            $ExceptionUnzipTools)
-                echo "Failed to unzip Android SDK Tools."
-                exit 1;
-            ;;
-            $ExceptionUnzipNdk)
-                echo "Failed to unzip Android NDK."
-                exit 1;
-            ;;
-            $ExceptionRmTools)
-                echo "Failed to remove temporary tools package '$toolsTargetFile'."
-                exit 1;
-            ;;
-            $ExceptionRmNdk)
-                echo "Failed to remove temporary NDK package '$ndkTargetFile'."
-                exit 1;
-            ;;
-            $ExceptionSdkManager)
-                echo "Failed to run sdkmanager."
-                exit 1;
-            ;;
-        esac
-}
+SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
+SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
+SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 
+echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+echo "Android NDK = $ndkVersion" >> ~/versions.txt

coin/provisioning/common/linux/disable_selinux.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 # We need to disable selinux while we are overwriting some binaries
 # required by it. If this is not done, ICU provisioning will create
 # template that is not booting.

coin/provisioning/common/linux/open62541.sh

@@ -1,63 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-set +e
-
-# We need to source to be able to use cmake in the shell
-if uname -a |grep -q "Ubuntu"; then
-    source ~/.profile
-else
-    source ~/.bashrc
-fi
-
-set -ex
-
-TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
-trap "sudo rm -fr $TEMPDIR" EXIT
-cd $TEMPDIR
-
-sudo pip install --upgrade pip
-sudo pip install six
-
-git clone https://github.com/open62541/open62541.git open62541
-cd open62541
-git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629
-mkdir build
-cd build
-cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib ..
-make
-
-sudo make install
-sudo /sbin/ldconfig

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -36,52 +36,31 @@
 # This script install OpenSSL from sources.
 # Requires GCC and Perl to be in PATH.
 
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+# shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.0.2g"
+version="1.0.2p"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
 installFolder="/home/qt/"
-sha="36af23887402a5ea4ebef91df8e61654906f58f2"
+sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
 # Until every VM doing Linux Android builds have provisioned the env variable
 # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
 # QTQAINFRA-1436
 opensslHome="${installFolder}openssl-1.0.2"
 
-ExceptionDownload=99
-ExceptionTar=100
-ExceptionConfig=101
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 
-try
-(
-    (DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile") || throw $ExceptionDownload
+tar -xzf "$targetFile" -C "$installFolder"
+# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
+mv "${opensslHome}p" "${opensslHome}"
+pushd "$opensslHome"
+echo "Running configure"
+perl Configure shared android
 
-    tar -xzf "$targetFile" -C "$installFolder" || throw $ExceptionTar
-    # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
-    mv "${opensslHome}g" "${opensslHome}"
-    pushd "$opensslHome"
-    perl Configure shared android || throw $ExceptionConfig
+SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
 
-    SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
-
-    echo "OpenSSL for Android = $version" >> ~/versions.txt
-)
-catch || {
-    case $ex_code in
-        $ExceptionDownload)
-            exit 1;
-        ;;
-        $ExceptionTar)
-            echo "Failed to extract $targetFile"
-            exit 1;
-        ;;
-        $ExceptionConfig)
-            echo "Failed to run 'config'."
-            exit 1;
-        ;;
-    esac
-
-}
+echo "OpenSSL for Android = $version" >> ~/versions.txt

coin/provisioning/common/linux/qnx_660.sh

@@ -33,31 +33,34 @@
 ##
 #############################################################################
 
+# This script installs QNX 6.6.0.
+
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.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"
-SHA1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
+targetFolder="/opt/"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz"
+sha1="ffcf91489699c42ce9c1d74941f1829531752bbe"
+folderName="qnx660"
+targetFile="qnx660.tar.gz"
+wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+sudo tar -C $targetFolder -xvzf $targetFile
+sudo chown -R qt:users "$targetFolder"/"$folderName"
 
-DownloadURL $OfficialUrl $CachedUrl $SHA1 ./$packageEpel
-sudo rpm -Uvh $packageEpel
-sudo rm -f $packageEpel
+# Verify that we have last file in tar
+if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then
+    echo "Installation failed!"
+    exit -1
+fi
 
-# install python3
-sudo yum install -y python34-devel
+rm -rf $targetFile
 
-# install pip3
-
-packagePip="get-pip.py"
-OfficialUrlPip="https://bootstrap.pypa.io/$packagePip"
-CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip"
-SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d"
-
-DownloadURL $OfficialUrlPip $CachedUrlPip $SHA1Pip ./$packagePip
-sudo python3 $packagePip
-sudo rm -f $packagePip
-sudo pip3 install virtualenv
+# Set env variables
+SetEnvVar "QNX_660" "$targetFolder$folderName"
 
+echo "QNX SDP = 6.6.0" >> ~/versions.txt

coin/provisioning/common/linux/qnx_700.sh

@@ -40,8 +40,8 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
-sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz"
+sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c"
 folderName="qnx700"
 targetFile="qnx700.tar.xz"
 wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile"
@@ -59,7 +59,6 @@ if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
 fi
 
 rm -rf $targetFile
-
 # Set env variables
 SetEnvVar "QNX_700" "$targetFolder$folderName"
 

coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh

@@ -37,21 +37,11 @@
 # uncompresses it and installs it by default
 # to /Applications/. This can be overridden by a target parameter.
 
-# shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+set -ex
+
 # shellcheck source=DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
-ExceptionDownload=99
-ExceptionCreateTmpFile=100
-ExceptionCreateTmpDirectory=101
-ExceptionUncompress=102
-ExceptionMoveApp=103
-ExceptionDeleteTmpFile=104
-ExceptionRemoveTmpDirectory=105
-ExceptionUnknownFormat=106
-
-
 function InstallAppFromCompressedFileFromURL {
     url=$1
     url_alt=$2
@@ -63,74 +53,39 @@ function InstallAppFromCompressedFileFromURL {
         target="/Applications/"
     fi
 
-    try
-    (
-        basefilename=${url##*/}
-        extension=${basefilename##*.}
-        filename=${basefilename%.*}
-        if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
-            extension="tar.gz"
-        fi
+    basefilename=${url##*/}
+    extension=${basefilename##*.}
+    filename=${basefilename%.*}
+    if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
+        extension="tar.gz"
+    fi
 
-        echo "Extension for file: $extension"
-        echo "Creating temporary file and directory"
-        targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile
-        # macOS 10.10 mktemp does require prefix
-        if [[ $OSTYPE == "darwin14" ]]; then
-            targetDirectory=$(mktemp -d -t '10.10') || throw $ExceptionCreateTmpDirectory
-        else
-            targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
-        fi
-        (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
-        echo "Uncompress $targetFile"
-        case $extension in
-            "tar.gz")
-                tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress
-            ;;
-            "zip")
-                unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress
-            ;;
-            *)
-                throw $ExceptionUnknownFormat
-            ;;
-        esac
-        echo "Moving app to '$target'"
-        sudo mv "$targetDirectory/$appPrefix/"* "$target" || throw $ExceptionMoveApp
-        echo "Removing file '$targetFile'"
-        rm "$targetFile" || throw $ExceptionDeleteTmpFile
-        echo "Removing directory '$targetDirectory'"
-        rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory
-    )
-
-    catch || {
-        case $ex_code in
-            $ExceptionDownload)
-                exit 1;
-            ;;
-            $ExceptionCreateTmpFile)
-                echo "Failed to create temporary file"
-                exit 1;
-            ;;
-            $ExceptionUncompress)
-                echo "Failed extracting compressed file."
-                exit 1;
-            ;;
-            $ExceptionMoveApp)
-                echo "Failed moving app to '$target'."
-                exit 1;
-            ;;
-            $ExceptionDeleteTmpFile)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-            $ExceptionRemoveTmpDirectory)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-            $ExceptionUnknownFormat)
-                echo "Unknown file format."
-                exit 1;
-            ;;
-        esac
-    }
+    echo "Extension for file: $extension"
+    echo "Creating temporary file and directory"
+    targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension")
+    # macOS 10.10 mktemp does require prefix
+    if [[ $OSTYPE == "darwin14" ]]; then
+        targetDirectory=$(mktemp -d -t '10.10')
+    else
+        targetDirectory=$(mktemp -d)
+    fi
+    (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile")
+    echo "Uncompress $targetFile"
+    case $extension in
+        "tar.gz")
+            tar -xzf "$targetFile" --directory "$targetDirectory"
+        ;;
+        "zip")
+            unzip -q "$targetFile" -d "$targetDirectory"
+        ;;
+        *)
+            exit 1
+        ;;
+    esac
+    echo "Moving app to '$target'"
+    sudo mv "$targetDirectory/$appPrefix/"* "$target"
+    echo "Removing file '$targetFile'"
+    rm "$targetFile"
+    echo "Removing directory '$targetDirectory'"
+    rm -rf "$targetDirectory"
 }

coin/provisioning/common/macos/InstallPKGFromURL.sh

@@ -33,16 +33,7 @@
 ##
 #############################################################################
 
-# shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
-
-ExceptionCreateTmpFile=100
-ExceptionDownloadPrimaryUrl=101
-ExceptionDownloadAltUrl=102
-ExceptionSHA1=103
-ExceptionInstallerPKG=104
-ExceptionDeleteTmpFile=105
-
+set -ex
 
 function InstallPKGFromURL {
     url=$1
@@ -50,55 +41,19 @@ function InstallPKGFromURL {
     expectedSha1=$3
     targetDirectory=$4
 
-    try
-    (
-        echo "Creating temporary file"
-        targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg") || trow $ExceptionCreateTmpFile
-        try
-        (
-            echo "Downloading PKG 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 PKG 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
-        /usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1
-        echo "Run installer on PKG"
-        sudo installer -package "$targetFile" -target "$targetDirectory" || throw $ExceptionInstallerPKG
-        echo "Removing file '$targetFile'"
-        rm "$targetFile" || throw $ExceptionDeleteTmpFile
+    echo "Creating temporary file"
+    targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg")
+    echo "Downloading PKG from primary URL '$url'"
+    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || (
+        echo "Failed to download '$url' multiple times"
+        echo "Downloading PKG from alternative URL '$url_alt'"
+        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
     )
-
-    catch || {
-        case $ex_code in
-            $ExceptionCreateTmpFile)
-                echo "Failed to create temporary file"
-                exit 1;
-            ;;
-            $ExceptionDownloadAltUrl)
-                echo "Failed downloading PKG from primary and alternative URLs"
-                exit 1;
-            ;;
-            $ExceptionSHA1)
-                echo "Failed to check sha1sum."
-                exit 1;
-            ;;
-            $ExceptionInstallerPKG)
-                echo "Failed running installer on PKG."
-                exit 1;
-            ;;
-            $ExceptionDeleteTmpFile)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-        esac
-    }
+    echo "Checking SHA1 on PKG '$targetFile'"
+    echo "$expectedSha1 *$targetFile" > $targetFile.sha1
+    /usr/bin/shasum --check $targetFile.sha1
+    echo "Run installer on PKG"
+    sudo installer -package "$targetFile" -target "$targetDirectory"
+    echo "Removing file '$targetFile'"
+    rm "$targetFile"
 }

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
+

coin/provisioning/common/macos/fbx_macos.sh

@@ -34,8 +34,8 @@
 
 # This script installs FBX SDK
 
-# shellcheck source=./../unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+set -ex
+
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
@@ -50,27 +50,18 @@ installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
 
 ExceptionExtractPrimaryUrl=100
 
-try
-(
-    echo "Extracting '$cachedUrl'"
-    tar -xzf "$cachedUrl" -C "$targetFolder" || throw $ExceptionExtractPrimaryUrl
+echo "Extracting '$cachedUrl'"
+tar -xzf "$cachedUrl" -C "$targetFolder" || (
+    echo "Failed to uncompress from '$cachedUrl'"
+    echo "Downloading from '$officialUrl'"
+    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl"
+    echo "Checking SHA1 on PKG '$targetFile'"
+    echo "$sha1 *$targetFile" > $targetFile.sha1
+    shasum --check $targetFile.sha1
+    echo "Extracting '$targetFile'"
+    tar -xzf "$targetFile" -C "$targetFolder"
 )
-catch || {
-    case $ex_code in
-        $ExceptionExtractPrimaryUrl)
-        set -e
-        echo "Failed to uncompress from '$cachedUrl'"
-        echo "Downloading from '$officialUrl'"
-        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl" || exit 1;
-        echo "Checking SHA1 on PKG '$targetFile'"
-        echo "$sha1 *$targetFile" > $targetFile.sha1
-        shasum --check $targetFile.sha1
-        echo "Extracting '$targetFile'"
-        tar -xzf "$targetFile" -C "$targetFolder" || exit 1;
-        ;;
-    esac
-}
-set -e
+
 rm -rf "$targetFile"
 echo "Running installer for '$installer'"
 sudo installer -pkg "$installer" -target "/"

coin/provisioning/common/macos/install-commandlinetools.sh

@@ -33,56 +33,30 @@
 ##
 #############################################################################
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 set -ex
 
 # Command line tools is need by homebrew
 
 function InstallCommandLineTools {
-
-    ExceptionMount=101
-    ExceptionInstall=102
-    ExceptionUnmount=103
-
     url=$1
     url_alt=$2
     expectedSha1=$3
     packageName=$4
     version=$5
 
-    try
-    (
-        DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
-        echo "Mounting $packageName"
-        hdiutil attach /tmp/$packageName || throw $ExceptionMount
-        cd "/Volumes/Command Line Developer Tools"
-        echo "Installing"
-        sudo installer -verbose -pkg *.pkg -target / || throw $ExceptionInstall
-        cd /
-        # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
-        sleep 3
-        echo "Unmounting"
-        umount /Volumes/Command\ Line\ Developer\ Tools/ || throw $ExceptionUnmount
-        echo "Removing $packageName"
-        rm /tmp/$packageName
-
-        echo "Command Line Tools = $version" >> ~/versions.txt
-    )
-    catch || {
-        case $ex_code in
-            $ExceptionMount)
-                echo "Failed to mount"
-                exit 1;
-            ;;
-            $ExceptionInstall)
-                echo "Failed to install"
-                exit 1;
-            ;;
-            $ExceptionUnmount)
-                echo "Failed to unmount"
-                exit 1;
-
-        esac
-    }
+    DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
+    echo "Mounting $packageName"
+    hdiutil attach /tmp/$packageName
+    cd "/Volumes/Command Line Developer Tools"
+    echo "Installing"
+    sudo installer -pkg ./*.pkg -target / -allowUntrusted
+    cd /
+    # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
+    sleep 3
+    echo "Unmounting"
+    umount /Volumes/Command\ Line\ Developer\ Tools/
+    echo "Removing $packageName"
+    rm /tmp/$packageName
 
+    echo "Command Line Tools = $version" >> ~/versions.txt
 }

coin/provisioning/common/macos/install_xcode.sh

@@ -44,48 +44,18 @@
 
 
 
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
-
-function InstallXCode()
-{
-    ExceptionCPIO=103
-    ExceptionAcceptLicense=105
-    ExceptionDeveloperMode=113
-
+function InstallXCode() {
     sourceFile=$1
     version=$2
 
-    try
-    (
-        echo "Uncompressing and installing '$sourceFile'"
-        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) || throw $ExceptionCPIO
+    echo "Uncompressing and installing '$sourceFile'"
+    xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
 
-        echo "Accept license"
-        sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
+    echo "Accept license"
+    sudo xcodebuild -license accept
 
-        echo "Enabling developer mode, so that using lldb does not require interactive password entry"
-        sudo /usr/sbin/DevToolsSecurity -enable || throw $ExceptionDeveloperMode
-
-        echo "Xcode = $version" >> ~/versions.txt
-    )
-    catch || {
-        case $ex_code in
-            $ExceptionCPIO)
-                echo "Failed to unarchive .cpio."
-                exit 1;
-            ;;
-            $ExceptionDeveloperMode)
-                echo "Failed to enable developer mode."
-                exit 1;
-            ;;
-            $ExceptionAcceptLicense)
-                echo "Failed to accept license."
-                exit 1;
-            ;;
-
-        esac
-    }
+    echo "Enabling developer mode, so that using lldb does not require interactive password entry"
+    sudo /usr/sbin/DevToolsSecurity -enable
 
+    echo "Xcode = $version" >> ~/versions.txt
 }
-

coin/provisioning/common/macos/install_xcode_9_orHigher.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,29 +33,45 @@
 ##
 #############################################################################
 
-set -ex
+# This script installs Xcode
+# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
+# This can be achieved by fetching Xcode_8.xip from Apple Store.
+# Uncompress it with 'xar -xf Xcode_8.xip'
+# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
+# with which you can run 'python parse_pbzx2.py Content'.
+# This will give you a file called "Content.part00.cpio.xz" that
+# can be renamed to Xcode_8.xz for this script.
 
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
-version="17.0.1-6.20170307.wayland"
-wayland_egl_rpm="mesa-libwayland-egl-$version.el7.x86_64.rpm"
-wayland_egl_sha1="0a42fddd9a58c0bcd93efdaf84fd54b872f050d0"
-wayland_egl_devel_rpm="mesa-libwayland-egl-devel-$version.el7.x86_64.rpm"
-wayland_egl_devel_sha1="3ece8768e6bdd8603ce15d75f3b80895da038f15"
-mirror1="http://ci-files01-hki.intra.qt.io/input/wayland"
-mirror2=$mirror1
 
-echo "Installing libwayland-egl development packages on RHEL"
+function InstallXCode() {
+    sourceFile=$1
+    version=$2
 
-# We're installing the packages with `--nodeps` because we've already installed
-# the Wayland libraries, but not through the package manager.
+    echo "Uncompressing and installing '$sourceFile'"
+    if [[ $sourceFile =~ tar ]]; then
+        cd /Applications/ && sudo tar -zxf "$sourceFile"
+    else
+        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
+    fi
 
-DownloadURL $mirror1/$wayland_egl_rpm $mirror2/$wayland_egl_rpm $wayland_egl_sha1 /tmp/$wayland_egl_rpm
-sudo rpm -i --nodeps /tmp/$wayland_egl_rpm
-rm /tmp/$wayland_egl_rpm
+    echo "Versioning application bundle"
+    majorVersion=$(echo $version | cut -d '.' -f 1)
+    versionedAppBundle="/Applications/Xcode${majorVersion}.app"
+    sudo mv /Applications/Xcode.app ${versionedAppBundle}
 
-DownloadURL $mirror1/$wayland_egl_devel_rpm $mirror2/$wayland_egl_devel_rpm $wayland_egl_devel_sha1 /tmp/$wayland_egl_devel_rpm
-sudo rpm -i --nodeps /tmp/$wayland_egl_devel_rpm
-rm /tmp/$wayland_egl_devel_rpm
+    echo "Selecting Xcode"
+    sudo xcode-select --switch ${versionedAppBundle}
 
-echo "mesa-libwayland-egl = $version" >> ~/versions.txt
+    echo "Accept license"
+    sudo xcodebuild -license accept
+
+    echo "Install packages"
+    # -runFirstLaunch is valid in 9.x
+    sudo xcodebuild -runFirstLaunch || true
+
+    echo "Enabling developer mode, so that using lldb does not require interactive password entry"
+    sudo /usr/sbin/DevToolsSecurity -enable
+
+    echo "Xcode = $version" >> ~/versions.txt
+}

coin/provisioning/common/macos/java.sh

@@ -39,94 +39,25 @@ set -ex
 
 echo "Installing Java Development Kit"
 
-# shellcheck source=../unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+targetFile=jdk-8u102-macosx-x64.dmg
 
-ExceptionDownloadPrimaryUrl=100
-ExceptionDownloadAltUrl=101
-ExceptionSHA1=102
-ExceptionAttachImage=103
-ExceptionInstall=104
-ExceptionDetachImage=105
-ExceptionRemoveTmpFile=106
-ExceptionDisableAutoUpdate=107
+url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
+# url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
 
+echo "Mounting $targetFile"
+sudo mount "$url" /Volumes
 
-url=http://ci-files01-hki.intra.qt.io/input/mac/jdk-8u102-macosx-x64.dmg
-url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
-targetFile=/tmp/jdk-8u102-macosx-x64.dmg
-expectedSha1=1405af955f14e32aae187b5754a716307db22104
+sudo cp "/Volumes/$targetFile" /tmp
+sudo umount /Volumes
+sudo hdiutil attach "/tmp/$targetFile"
 
-try
-(
-    try
-    (
-        echo "Downloading from primary URL '$url'"
-        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl
-    )
-    catch || {
-        case $ex_code in
-            $ExceptionDownloadPrimaryUrl)
-                echo "Failed to download '$url' multiple times"
-                echo "Downloading tar.gz from alternative URL '$url_alt'"
-                curl --fail -L --retry 5 --retry-delay 5 -j -k -H "Cookie: oraclelicense=accept-securebackup-cookie" -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
-            ;;
-        esac
-    }
-    echo "Checking SHA1 on '$targetFile'"
-    echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
+echo Installing JDK
+cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /
 
-    echo Mounting DMG
-    hdiutil attach "$targetFile" || throw $ExceptionAttachImage
+echo "Unmounting $targetFile"
+sudo hdiutil unmount /Volumes/JDK\ 8\ Update\ 102/ -force
 
-    echo Installing JDK
-    (cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /) || throw $ExceptionInstall
+echo "Disable auto update"
+sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
 
-    disk=`hdiutil info | grep '/Volumes/JDK 8 Update 102' | awk '{print $1}'`
-    hdiutil detach $disk || throw $ExceptionDetachImage
-
-    echo "Removing temporary file '$targetFile'"
-    rm "$targetFile" || throw $ExceptionRemoveTmpFile
-
-    echo "Disable auto update"
-    sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false || throw $ExceptionDisableAutoUpdate
-
-    echo "JDK Version = 8 update 102" >> ~/versions.txt
-)
-catch || {
-    case $ex_code in
-        $ExceptionDownloadPrimaryUrl)
-            echo "Failed to download JDK from primary URL."
-            exit 1;
-        ;;
-        $ExceptionDownloadAltUrl)
-            echo "Failed to download JDK from alternative URL."
-            exit 1;
-        ;;
-        $ExceptionSHA1)
-            echo "Failed to check SHA1."
-            exit 1;
-        ;;
-        $ExceptionAttachImage)
-            echo "Failed to attach image."
-            exit 1;
-        ;;
-        $ExceptionInstall)
-            echo "Failed to install JDK."
-            exit 1;
-        ;;
-        $ExceptionDetachImage)
-            echo "Failed to detach image."
-            exit 1;
-        ;;
-        $ExceptionRemoveTmpFile)
-            echo "Failed to remove temporary file."
-            exit 1;
-        ;;
-        $ExceptionDisableAutoUpdate)
-            echo "Failed to disable auto update."
-            exit 1;
-        ;;
-
-    esac
-}
+echo "JDK Version = 8 update 102" >> ~/versions.txt

coin/provisioning/common/macos/pip.sh

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
-# Will install pip utility for python
-curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-sudo python get-pip.py
-rm get-pip.py
+
+function InstallPip {
+
+    python=$1
+
+    # Will install pip utility for python
+    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+    sudo "$python" get-pip.py
+    rm get-pip.py
+}

coin/provisioning/common/macos/python2.sh

@@ -35,8 +35,12 @@
 
 # This script installs python2
 
+# shellcheck source=./InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
+# shellcheck source=./../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+# shellcheck source=./pip.sh
+source "${BASH_SOURCE%/*}/pip.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"
@@ -45,8 +49,11 @@ DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
+InstallPip /Library/Frameworks/Python.framework/Versions/2.7/bin/python
+
 /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
+

coin/provisioning/common/macos/python3.sh

@@ -36,8 +36,12 @@
 
 # This script installs python3
 
+# shellcheck source=./InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
+# shellcheck source=./../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+# shellcheck source=./pip.sh
+source "${BASH_SOURCE%/*}/pip.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg"
 AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
@@ -46,9 +50,12 @@ DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
+InstallPip /Library/Frameworks/Python.framework/Versions/3.6/bin/python3
+
 /Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv
 
 SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
 SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
 
 echo "python3 = 3.6.1" >> ~/versions.txt
+

coin/provisioning/common/macos/sha1sum-compatibility.sh

@@ -0,0 +1,49 @@
+#!/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$
+##
+#############################################################################
+
+# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'.
+# In order to make all unix provioning scripts run on macOS without special case handling
+# a symbolic link is created.
+# The shasum tool is a perl script which does some globbing to determine the perl version. The
+# symbolic link has to point directly to the binary including the perl version.
+# Additionally the CI seems to have multiple parallel perl versions installed which causes
+# multiple shasum tools to be present (shasum5.16, shasum5.18).
+#
+# Currently this is
+#     /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
+
+[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
+SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
+sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum

coin/provisioning/common/unix/DownloadURL.sh

@@ -40,51 +40,22 @@
 # 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
-        shasum --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
+    rm -f $targetFile.sha1
 }
 

coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh

@@ -33,21 +33,11 @@
 ##
 #############################################################################
 
-# shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
+set -ex
+
 # shellcheck source=DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-ExceptionDownload=99
-ExceptionCreateTmpFile=100
-ExceptionCreateTmpDirectory=101
-ExceptionUncompress=102
-ExceptionMoveApp=103
-ExceptionDeleteTmpFile=104
-ExceptionRemoveTmpDirectory=105
-ExceptionUnknownFormat=106
-
-
 function InstallFromCompressedFileFromURL {
     url=$1
     url_alt=$2
@@ -55,70 +45,35 @@ function InstallFromCompressedFileFromURL {
     installDirectory=$4
     appPrefix=$5
 
-    try
-    (
-        basefilename=${url##*/}
-        extension=${basefilename##*.}
-        filename=${basefilename%.*}
-        if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
-            extension="tar.gz"
-        fi
-        echo "Extension for file: $extension"
-        echo "Creating temporary file and directory"
-        targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension") || throw $ExceptionCreateTmpFile
-        targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
-        (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
-        echo "Uncompress $targetFile"
-        case $extension in
-            "tar.gz")
-                tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress
-            ;;
-            "zip")
-                unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress
-            ;;
-            *)
-                throw $ExceptionUnknownFormat
-            ;;
-        esac
-        echo "Moving app to $installDirectory"
-        sudo mkdir -p "$installDirectory"
-        sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory" || throw $ExceptionMoveApp
-        echo "Removing file '$targetFile'"
-        rm "$targetFile" || throw $ExceptionDeleteTmpFile
-        echo "Removing directory '$targetDirectory'"
-        rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory
-    )
-
-    catch || {
-        case $ex_code in
-            $ExceptionDownload)
-                exit 1;
-            ;;
-            $ExceptionCreateTmpFile)
-                echo "Failed to create temporary file"
-                exit 1;
-            ;;
-            $ExceptionUncompress)
-                echo "Failed extracting compressed file."
-                exit 1;
-            ;;
-            $ExceptionMoveApp)
-                echo "Failed moving app to target location."
-                exit 1;
-            ;;
-            $ExceptionDeleteTmpFile)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-            $ExceptionRemoveTmpDirectory)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-            $ExceptionUnknownFormat)
-                echo "Unknown file format."
-                exit 1;
-            ;;
-        esac
-    }
+    basefilename=${url##*/}
+    extension=${basefilename##*.}
+    filename=${basefilename%.*}
+    if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
+        extension="tar.gz"
+    fi
+    echo "Extension for file: $extension"
+    echo "Creating temporary file and directory"
+    targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension")
+    targetDirectory=$(mktemp -d)
+    DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
+    echo "Uncompress $targetFile"
+    case $extension in
+        "tar.gz")
+            tar -xzf "$targetFile" --directory "$targetDirectory"
+        ;;
+        "zip")
+            unzip "$targetFile" -d "$targetDirectory"
+        ;;
+        *)
+            exit 1
+        ;;
+    esac
+    echo "Moving app to $installDirectory"
+    sudo mkdir -p "$installDirectory"
+    sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory"
+    echo "Removing file '$targetFile'"
+    rm "$targetFile"
+    echo "Removing directory '$targetDirectory'"
+    rm -rf "$targetDirectory"
 }
 

coin/provisioning/common/unix/check_and_set_proxy.sh

@@ -32,19 +32,8 @@
 ##
 #############################################################################
 
-source "${BASH_SOURCE%/*}/try_catch.sh"
-source "${BASH_SOURCE%/*}/../http_proxy.txt"
+set -ex
 
-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
+source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
 
+(wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy) || echo "Proxy not detected at $proxy"

coin/provisioning/common/unix/libclang.sh

@@ -52,7 +52,7 @@ if [ $# -eq 0 ]
     # The default values are for macOS package
     echo "Using macOS defaults"
     version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
+    url="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z"
     sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
 fi
 
@@ -60,12 +60,7 @@ zip="libclang.7z"
 destination="/usr/local/libclang-$version"
 
 curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
-_shasum=sha1sum
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    echo "DARWIN"
-    _shasum=/usr/bin/shasum
-fi
-echo "$sha1  $zip" | $_shasum --check
+echo "$sha1  $zip" | sha1sum --check
 7z x $zip -o/tmp/
 rm -rf $zip
 

coin/provisioning/common/unix/mqtt_broker.sh

@@ -1,55 +0,0 @@
-#!/bin/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$
-##
-#############################################################################
-
-# This script installs paho testing broker
-
-# shellcheck source=./InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
-AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="532fe145096cdd8d679f425cbfd883289150c968"
-targetFolder="/opt/paho_broker"
-appPrefix="paho.mqtt.testing-$CommitSHA"
-
-sudo rm -fr "$targetFolder"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding MQTT broker path to environment"
-SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py"
-
-echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt

coin/provisioning/common/unix/squishInstall.sh

@@ -33,14 +33,12 @@
 ##
 #############################################################################
 
-source "${BASH_SOURCE%/*}/try_catch.sh"
-
 set -ex
 
 # This script will install squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.3.0"
+version="6.5.1"
 # Branch version without dot
 qtBranch="59x"
 squishFolder="/opt/squish"
@@ -65,18 +63,7 @@ if [ -f "/etc/profile.d/squish_env.sh" ]; then
     export SQUISH_LICENSEKEY_DIR=$HOME
 fi
 
-ExceptionMount=100
-ExceptionCreateFolder=101
-ExceptionUncompress=102
-ExceptionUnknownFormat=103
-ExceptionCopy=104
-ExceptionUmount=105
-ExceptionHdiutilAttach=106
-ExceptionInstallSquish=107
-ExceptionChangeOwnership=108
-
 function MountAndInstall {
-
     url=$1
     targetDirectory=$2
     targetFile=$3
@@ -102,96 +89,51 @@ function MountAndInstall {
 
     targetFileMount="$mountFolder"/"$targetFile"
 
-    try
-    (
-        echo "Mounting $url to $mountFolder"
-        sudo mount "$url" $mountFolder || throw $ExceptionMount
-        echo "Create $targetDirectory if needed"
-        if [ !  -d "/opt" ]; then
-            sudo mkdir "/opt" || throw $ExceptionCreateFolder
-        fi
-        if [ !  -d "$targetDirectory" ]; then
-            sudo mkdir "$targetDirectory" || throw $ExceptionCreateFolder
-        fi
-        echo "Uncompress $targetFile"
-        if [[ $targetFile == *.tar.gz ]]; then
-            if [[ $targetFile == .squish-3-license.* ]]; then
-                target="$squishLicenseDir"
-                # Squish license need to be exists also in users home directory, because squish check it before it starts running tests
-                sudo tar -xzf "$targetFileMount" --directory "$HOME" || throw $ExceptionUncompress
-            else
-                target="$targetDirectory"
-            fi
-            sudo tar -xzf "$targetFileMount" --directory "$target" || throw $ExceptionUncompress
-            echo "Unmounting $mountFolder"
-            sudo umount $mountFolder || throw $ExceptionUmount
-        elif [[ $targetFile == *.dmg ]]; then
-            echo "'dmg-file', no need to uncompress"
-            sudo cp $targetFileMount /tmp || throw $ExceptionCopy
-            sudo umount $mountFolder || throw $ExceptionUmount
-            sudo hdiutil attach "/tmp/$targetFile" || throw $ExceptionHdiutilAttach
-            sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" || throw $ExceptionInstallSquish
-            sudo hdiutil unmount /Volumes/froglogic\ Squish/
-        elif [[ $targetFile == *.run ]]; then
-            echo "'run-file', no need to uncompress"
-            sudo cp $targetFileMount $targetDirectory || throw $ExceptionCopy
-            sudo umount $mountFolder || throw $ExceptionUmount
-            sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 || throw $ExceptionInstallSquish
-            sudo rm -fr "$targetDirectory/$targetFile"
-            if uname -a |grep -q "Ubuntu"; then
-                sudo mkdir /usr/lib/tcl8.6 || throw $ExceptionCreateFolder
-                sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ || throw $ExceptionCopy
-            fi
+    echo "Mounting $url to $mountFolder"
+    sudo mount "$url" $mountFolder
+    echo "Create $targetDirectory if needed"
+    if [ !  -d "/opt" ]; then
+        sudo mkdir "/opt"
+    fi
+    if [ !  -d "$targetDirectory" ]; then
+        sudo mkdir "$targetDirectory"
+    fi
+    echo "Uncompress $targetFile"
+    if [[ $targetFile == *.tar.gz ]]; then
+        if [[ $targetFile == .squish-3-license.* ]]; then
+            target="$squishLicenseDir"
+            # Squish license need to be exists also in users home directory, because squish check it before it starts running tests
+            sudo tar -xzf "$targetFileMount" --directory "$HOME"
         else
-            throw $ExceptionUnknownFormat
+            target="$targetDirectory"
         fi
+        sudo tar -xzf "$targetFileMount" --directory "$target"
+        echo "Unmounting $mountFolder"
+        sudo umount $mountFolder
+    elif [[ $targetFile == *.dmg ]]; then
+        echo "'dmg-file', no need to uncompress"
+        sudo cp $targetFileMount /tmp
+        sudo umount $mountFolder
+        sudo hdiutil attach "/tmp/$targetFile"
+        sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory"
+        sudo hdiutil unmount /Volumes/froglogic\ Squish/
+    elif [[ $targetFile == *.run ]]; then
+        echo "'run-file', no need to uncompress"
+        sudo cp $targetFileMount $targetDirectory
+        sudo umount $mountFolder
+        sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
+        sudo rm -fr "$targetDirectory/$targetFile"
+        if uname -a |grep -q "Ubuntu"; then
+            sudo mkdir /usr/lib/tcl8.6
+            sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+        fi
+    else
+        exit 1
+    fi
 
-        echo "Changing ownerships"
-        sudo chown -R qt:$usersGroup "$targetDirectory" || throw $ExceptionChangeOwnership
-        sudo chown qt:$usersGroup "$HOME/.squish-3-license"
-
-    )
-
-    catch || {
-        case $ex_code in
-            $ExceptionMount)
-                echo "Failed to mount $url to $mountFolder."
-                exit 1;
-            ;;
-            $ExceptionCreateFolder)
-                echo "Failed to create folder"
-                exit 1;
-            ;;
-            $ExceptionUncompress)
-                echo "Failed extracting compressed file."
-                exit 1;
-            ;;
-            $ExceptionUnknownFormat)
-                echo "Unknown file format."
-                exit 1;
-            ;;
-            $ExceptionCopy)
-                echo "Failed to copy"
-                exit 1;
-            ;;
-            $ExceptionUmount)
-                echo "Failed to unmount $mountFolder."
-                exit 1;
-            ;;
-            $ExceptionHdiutilAttach)
-                echo "Failed to hdituli attach $mountFolder/$targetFile."
-                exit 1;
-            ;;
-            $ExceptionInstallSquish)
-                echo "Failed to install squish"
-                exit 1;
-            ;;
-            $ExceptionChangeOwnership)
-                echo "Failed to change ownership of $targetDirectory."
-                exit 1;
-            ;;
-        esac
-    }
+    echo "Changing ownerships"
+    sudo chown -R qt:$usersGroup "$targetDirectory"
+    sudo chown qt:$usersGroup "$HOME/.squish-3-license"
 }
 
 echo "Set commands for environment variables in .bashrc"

coin/provisioning/common/windows/3dstudio_3rdparty.ps1

@@ -1,9 +1,8 @@
 . "$PSScriptRoot\helpers.ps1"
 
 $zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
-$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip"
 
-Download $url $url $zip
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
 Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
 Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
 Remove-Item -Path $zip

coin/provisioning/common/windows/android-openssl.ps1

@@ -39,31 +39,41 @@
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
-$version = "1.0.2j"
-$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
-$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
-$destination = "C:\Utils\openssl-android-master"
-
-Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
-Verify-Checksum $zip $sha1
-
-Extract-7Zip $zip C:\Utils
-Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
-Rename-Item C:\Utils\openssl-$version $destination
-Remove-Item -Path $zip
-Remove-Item C:\Utils\openssl-$version.tar
+# Android openssl was preconfigured manually. More info in jira ticket  https://bugreports.qt.io/browse/QTQAINFRA-3258
+# Android openssl was configured with following way and cached to ci-files01-hki.intra.qt.io\provisioning\openssl\.
+#################################################################
+## $version = "1.0.2p"
+## $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
+## $sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
+## $destination = "C:\Utils\openssl-android-master"
+## Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
+## Verify-Checksum $zip $sha1
+## Extract-7Zip $zip C:\Utils
+## Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
+## Rename-Item C:\Utils\openssl-$version $destination
+## Remove-Item -Path $zip
+## Remove-Item C:\Utils\openssl-$version.tar
+## Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
+## Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
+## Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
+### Make sure configure for openssl has a "make" and "perl" available
+## $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
+## Write-Host "Configuring OpenSSL $version for Android..."
+## Push-Location $destination
+## Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
+## Pop-Location
+### Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
+## C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
+#################################################################
 
 Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
 Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
 Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
 
-# Make sure configure for openssl has a "make" and "perl" available
-$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
-
-Write-Host "Configuring OpenSSL $version for Android..."
-Push-Location $destination
-Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
-Pop-Location
-
-# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
-# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
+$version = "1.0.2t"
+$zip = "c:\users\qt\downloads\openssl-$version.7z"
+$sha1 = "6670ff13906a04fdbfe0fcbc075ff21839dca984"
+Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master_$version.7z \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master_$version.7z $zip
+Verify-Checksum $zip $sha1
+Extract-7Zip $zip C:\Utils
+Remove-Item -Path $zip

coin/provisioning/common/windows/helpers.ps1

@@ -112,6 +112,7 @@ function Download
         [string] $Destination = $(BadParam("a download target location"))
     )
     $ProgressPreference = 'SilentlyContinue'
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
     try {
         Write-Host "Downloading from cached location ($CachedUrl) to $Destination"
         if ($CachedUrl.StartsWith("http")) {
@@ -134,7 +135,6 @@ function Add-Path
 
     $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
     [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine)
-    $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
 }
 
 function Set-EnvironmentVariable
@@ -160,3 +160,22 @@ function isProxyEnabled {
 function getProxy {
     return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
 }
+
+function Remove {
+
+    Param (
+        [string]$Path = $(BadParam("a path"))
+    )
+    Write-Host "Removing $Path"
+    $i = 0
+    While ( Test-Path($Path) ){
+        Try{
+            remove-item -Force -Recurse -Path $Path -ErrorAction Stop
+        }catch{
+            $i +=1
+            if ($i -eq 5) {exit 1}
+            Write-Verbose "$Path locked, trying again in 5"
+            Start-Sleep -seconds 5
+        }
+    }
+}

coin/provisioning/common/windows/icu.ps1

@@ -39,7 +39,51 @@ $version = "53_1"
 
 if (Is64BitWinHost) {
 
+   $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_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
+
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
+      Write-Host "Fetching from URL ..."
+      Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
+      Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013
+      Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""}
+
+      Write-Host "Cleaning $icuPackage_msvc2013_64..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2013_64
+
+      Write-Output "ICU MSVC2013 = $version" >> ~\versions.txt
+   }
+
+# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
+[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?
 Set-EnvironmentVariable "CI_ICU_PATH_Mingw49" "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1"
 
+} else {
+
+   $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_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
+
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
+      Write-Host "Fetching from URL ..."
+      Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
+      Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32
+      Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""}
+
+      Write-Host "Cleaning $icuPackage_msvc2013_32..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2013_32
+
+      Write-Output "ICU MSVC2013 = $version" >> ~\versions.txt
+   }
+
+# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
+
 }

coin/provisioning/common/windows/install-gnuwin32.ps1

@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2019 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"
+
+# This script will install gnuwin32
+
+$prog = "gnuwin32"
+$zipPackage = "$prog.zip"
+$temp = "$env:tmp"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
+$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
+Download $externalUrl $internalUrl "$temp\$zipPackage"
+Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
+Extract-7Zip "$temp\$zipPackage" C:\Utils
+
+Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt

coin/provisioning/common/windows/install-jdk.ps1

@@ -62,14 +62,13 @@ try {
     $client.Headers.Add("Cookie", $cookie)
     $client.DownloadFile($official_url, $javaPackage)
 
-    Download $official_url $official_url $javaPackage
+    Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage
 }
 
 Verify-Checksum $javaPackage $sha1
 
 Run-Executable "$javaPackage" "/s SPONSORS=0"
-Write-Host "Cleaning $javaPackage.."
-Remove-Item -Recurse -Force -Path "$javaPackage"
+Remove "$javaPackage"
 
 Set-EnvironmentVariable "JAVA_HOME" "$installdir"
 Add-Path "$installdir\bin"

coin/provisioning/common/windows/install-mingw.ps1

@@ -57,7 +57,7 @@ function InstallMinGW
 
     Extract-7Zip $mingwPackage $TARGETDIR
 
-    Set-EnvironmentVariable "$envvar" ("$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2))
+    Set-EnvironmentVariable "$envvar" "$targetdir\mingw32"
 
     Write-Host "Cleaning $mingwPackage.."
     Remove-Item -Recurse -Force -Path "$mingwPackage"

coin/provisioning/common/windows/install-qnx660.ps1

@@ -33,16 +33,18 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This script will install Vulkan SDK
+# This script will install QNX 6.6.0
 
-$version = "1.0.51.0"
-$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
-$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
+$version = "6.6.0"
+$nondottedversion = $version -replace '[.]',''
+$targetFolder = "c:"
+$fileName = "qnx" + $nondottedversion + ".zip"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $fileName
+$zip = "C:\Windows\Temp\" + $fileName
 
-Copy-Item $url_cache $vulkanPackage
-Run-Executable $vulkanPackage "/S"
+Download $url_cache $url_cache $zip
+Verify-Checksum $zip "52e451648eeef1f14a516fa03d8ddd1a59d485cd"
+Extract-7Zip $zip $targetFolder
 
-Write-Host "Cleaning $vulkanPackage.."
-Remove-Item -Recurse -Force -Path "$vulkanPackage"
-
-Write-Output "Vulkan SDK = $version" >> ~\versions.txt
+Set-EnvironmentVariable "QNX_660" "$targetFolder"
+Write-Output "QNX = $version" >> ~\versions.txt

coin/provisioning/common/windows/libclang.ps1

@@ -4,32 +4,22 @@ param([Int32]$archVer=32)
 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
 # The Clang library (C-bindings), version 3.9 or higher is required for building.
 
-# Starting from Qt 5.11 QDoc requires Clang to parse C++
-
 Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
     $var = $_.Split('=')
     New-Variable -Name $var[0] -Value $var[1]
     $libclang_version = $libclang_version -replace '["."]'
 }
 
-$zip = "c:\users\qt\downloads\libclang.7z"
-$baseDestination = "C:\Utils\libclang-" + $libclang_version
 if ( $archVer -eq 64 ) {
     $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
-    $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z"
-    $destination = $baseDestination + "-64"
-
-    Download $url $url $zip
-    Verify-Checksum $zip $sha1
-
-    Extract-7Zip $zip C:\Utils\
-    Rename-Item C:\Utils\libclang $destination
-    Remove-Item -Force -Path $zip
+    $url = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-vs2015_64.7z"
+} else {
+    $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
+    $url = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-vs2015_32.7z"
 }
 
-$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
-$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z"
-$destination = $baseDestination + "-32"
+$zip = "c:\users\qt\downloads\libclang.7z"
+$destination = "C:\Utils\libclang-" + $libclang_version
 
 Download $url $url $zip
 Verify-Checksum $zip $sha1
@@ -38,5 +28,6 @@ Extract-7Zip $zip C:\Utils\
 Rename-Item C:\Utils\libclang $destination
 Remove-Item -Force -Path $zip
 
-Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+Set-EnvironmentVariable "LLVM_INSTALL_DIR" $destination
+
 Write-Output "libClang = $libclang_version" >> ~/versions.txt

coin/provisioning/common/windows/msvc_2015_update3_patch.ps1

@@ -47,7 +47,6 @@ if (Test-Path $preparedPackage) {
     # The prepared package contains updated packages so that not everything has to be downloaded
     Write-Host "Using prepared package"
     Copy-Item -Recurse $preparedPackage $packagePath
-    exit 0
     # Remove the whole downloaded folder
     $toRemove = $packagePath + "\vs14-kb3165756-update"
     $executable = "$toRemove\vs14-kb3165756.exe"

coin/provisioning/common/windows/openssl.ps1

@@ -36,7 +36,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
-$version = "1_0_2j"
+$version = "1_0_2t"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
@@ -47,8 +47,7 @@ if (Is64BitWinHost) {
     $installFolder = "C:\openssl"
     $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
     $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
-
+    $sha1 = "92288fb8f5d1af36960da518a21ed76cd9d7bd55"
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
     Verify-Checksum $packagex64 $sha1
@@ -74,7 +73,7 @@ if (Is64BitWinHost) {
 
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
+$sha1 = "db9bb96d33f2393e2a9912a28e2921e6bc879203"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/common/windows/patch_qnx.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2016 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -31,19 +31,21 @@
 ##
 #############################################################################
 
+# Patch QNX SDK due to issues in the standard library.
+# The patches are available here:
+# http://www.qnx.com/download/feature.html?programid=27555
+# A copy of the patch must be in the root of the Coin path in
+# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
+
+
 . "$PSScriptRoot\helpers.ps1"
 
-Write-Host "MQTT: Downloading Paho test broker..."
-$zip = "c:\users\qt\downloads\pahotest.zip"
-$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
-$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
-$sha1 = "532fe145096cdd8d679f425cbfd883289150c968"
+$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
+$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
+$tempDir = "C:\temp\qnx_path"
 
-Download $externalUrl $internalUrl $zip
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
 Verify-Checksum $zip $sha1
-
-Write-Host "MQTT: Installing $zip..."
-Extract-Zip $zip C:\Utils
-Remove-Item -Path $zip
-
-Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py"
+Extract-Zip $zip $tempDir
+Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
+Remove-Item $tempDir -recurse

coin/provisioning/common/windows/python.ps1

@@ -64,7 +64,7 @@ Add-Path "C:\Python27;C:\Python27\Scripts"
 Run-Executable "C:\Python27\python.exe" "-m ensurepip"
 
 # Install python virtual env
-#if (isProxyEnabled) {
+#if ( isProxyEnabled ) {
 #    Write-Host "Using proxy with pip"
 #    $pip_args = "--proxy=" + (getProxy)
 #}

coin/provisioning/common/windows/python3.ps1

@@ -65,7 +65,7 @@ Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
 Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
 
 # Install python virtual env
-#if (isProxyEnabled) {
+#if ( isProxyEnabled ) {
 #    Write-Host "Using proxy with pip"
 #    $pip_args = "--proxy=" + (getProxy)
 #}

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]
 
@@ -39,6 +39,7 @@ if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) {
     Write-Host "No proxy is defined."
 } else {
     Write-Host "Checking proxy @ $proxy"
+
     $proxy = $proxy -replace '"', ""
     $webclient = New-Object System.Net.WebClient
     $proxy_obj = New-Object System.Net.WebProxy($proxy)
@@ -52,8 +53,10 @@ if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) {
     }
     if ($iserror -eq $true) {
         Write-Host "Testing download with proxy does not work: $ErrorMessage, $FailedItem. Not setting proxy."
-    } else {
+    }
+    else {
         Write-Host "Setting proxy to: $proxy"
+
         Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer -Value "$proxy"
         Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyEnable -Value 1
         Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride -Value 10.215

coin/provisioning/common/windows/squishInstall.ps1

@@ -33,13 +33,18 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-
 # This script will install squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
+# NOTE! Make sure 64bit versions are always installed before 32bit,
+# because they use same folder name before a rename
+
+$version = "6.5.1"
 
-$version = "6.3.0"
 # Qt branch without dot (*.*)
 $qtBranch = "59x"
+# So far Squish built with Qt5.9 works also with 5.10 and 5.11, but we have to be prepared that on some point
+# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
+
 $targetDir = "C:\Utils\squish"
 $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
 $squishBranchUrl = "$squishUrl\$qtBranch"
@@ -49,23 +54,10 @@ $licensePackage = ".squish-3-license"
 
 $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName
 
-# This can be removed when using vanilla os
-if ((Test-Path -Path "$targetDir" )) {
-    try {
-        Write-Host "Renaming old Squish"
-        Write-Host "Rename-Item -ErrorAction 'Stop' $targetDir $targetDir_deleted"
-        Rename-Item -ErrorAction 'Stop' "$targetDir" squish_deleted
-    } catch {}
-}
-
 Function DownloadAndInstallSquish {
-
     Param (
         [string]$version,
-        [string]$squishBranchUrl,
-        [string]$qtBranch,
         [string]$bit,
-        [string]$targetDir,
         [string]$squishPackage
     )
 
@@ -78,81 +70,57 @@ Function DownloadAndInstallSquish {
     Write-Host "Installing Squish"
     Run-Executable "$SquishInstaller" "$SquishParameters"
     Remove-Item -Path $SquishInstaller
+    if ("$bit" -eq "win64") {
+        if ($squishPackage.StartsWith("mingw")) {
+            $squishPackage64bit = "mingw_64"
+        } else {
+            $squishPackage64bit = "$squishPackage`_64"
+        }
+        Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
+    } else {
+        if ($squishPackage.StartsWith("mingw")) {
+            Rename-Item $targetDir\$squishPackage $targetDir\mingw
+        }
+    }
 }
 
 Function DownloadSquishLicence {
-
     Param (
-        [string]$licensePackage,
-        [string]$squishUrl,
-        [string]$targetDir
+        [string]$squishUrl
     )
 
-    # This can be removed when using vanilla os
-    if ($Env:SQUISH_LICENSEKEY_DIR) {
-        Write-Host "Removing SQUISH_LICENSEKEY_DIR env variable"
-        Remove-Item Env:\SQUISH_LICENSEKEY_DIR
-    }
-
     Write-Host "Installing Squish license to home directory"
     Copy-Item $squishUrl\$licensePackage ~\$licensePackage
 }
 
+
 Write-Host "Creating $targetDir"
 New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir"
 
-DownloadSquishLicence $licensePackage $squishUrl $targetDir
+DownloadSquishLicence $squishUrl
 
-if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 8.1 Enterprise")) {
-    # Squish for MinGW
-    $squishPackageMingw = "mingw_gcc53_posix_dwarf"
-    Write-Host "Installing $squishPackageMingw"
-    DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw
-    mv $targetDir\$squishPackageMingw $targetDir\mingw
-
-    # Squish for Visual Studio 2015
-    $squishPackage = "msvc14"
-    $squishPackage64bit = "msvc14_64"
+if ($OSVersion -eq "Windows 10 Enterprise") {
 
     if (Is64BitWinHost) {
-        Write-Host "Installing $squishPackage64bit"
-        DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage
-        Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
+        DownloadAndInstallSquish $version win64 msvc14
     }
+    DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
+    DownloadAndInstallSquish $version win32 "msvc14"
 
-    Write-Host "Installing $squishPackage"
-    DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage
-}
-if ($OSVersion -eq "Windows 8.1 Enterprise") {
-    # Squish for Visual Studio 2013
-    $squishPackage64bit = "msvc12_64"
+} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
 
     if (Is64BitWinHost) {
-        Write-Host "Installing $squishPackage_64"
-        DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage
-        Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
-    } else {
-        Write-Host "Change secret file to normal one"
-        Run-Executable "attrib.exe" "-h C:\Users\qt\.squish-3-license"
+        DownloadAndInstallSquish $version win64 "msvc12"
+        DownloadAndInstallSquish $version win64 "msvc14"
     }
-}
-if  ($OSVersion -eq "Windows 7 Enterprise") {
-    # Squish for MinGW
-    $squishPackageMingw = "mingw_gcc53_posix_dwarf"
-    Write-Host "Installing $squishPackageMingw"
-    DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw
-    Rename-Item $targetDir\$squishPackageMingw $targetDir\mingw
+    DownloadAndInstallSquish $version win32 "msvc14"
 
-    # Squish for Visual Studio 2015
-    $squishPackage = "msvc14"
-    $squishPackage64bit = "msvc14_64"
-
-    Write-Host "Installing $squishPackage"
-    DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage
+} elseif ($OSVersion -eq "Windows 7 Enterprise") {
 
     if (Is64BitWinHost) {
-        Write-Host "Installing $squishPackage64bit"
-        DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage
-        Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
+        DownloadAndInstallSquish $version win64 "msvc12"
+        DownloadAndInstallSquish $version win64 "msvc14"
     }
+    DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
+    DownloadAndInstallSquish $version win32 "msvc14"
 }

coin/provisioning/common/windows/vc_redist.ps1

@@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 Write-Host "Installing $package..."
 Run-Executable $package "/q"
-Write-Host "Remove $package..."
-Remove-Item -Force -Path $package
+Remove $package

coin/provisioning/common/windows/win10-enable-devmode.ps1

@@ -2,13 +2,4 @@
 #
 # In order to run auto tests for UWP, we have to enable developer mode on Windows 10 machines.
 # https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development
-
-. "$PSScriptRoot\helpers.ps1"
-
-if (Is64BitWinHost) {
-    $bitness = "/reg:64"
-} else {
-    $bitness = "/reg:32"
-}
-
-Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock`" /V  AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F $bitness"
+REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F

coin/provisioning/common/windows/win10sdk.ps1

@@ -1,6 +1,4 @@
-#!/usr/bin/env bash
-
-#############################################################################
+############################################################################
 ##
 ## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
@@ -33,31 +31,20 @@
 ##
 #############################################################################
 
-set -ex
+. "$PSScriptRoot\helpers.ps1"
 
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+# This script will install Windows 10 SDK
 
-version=1.12.0
-sha1="9a0dd96f53fff3e227035ed76caaa209b632ea8d"
-archive="wayland-$version.tar.xz"
-primaryUrl="https://wayland.freedesktop.org/releases/$archive"
-cacheUrl="http://ci-files01-hki.intra.qt.io/input/wayland/$archive"
+$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\winsdksetup.exe"
+$url_official = "https://download.microsoft.com/download/8/C/3/8C37C5CE-C6B9-4CC8-8B5F-149A9C976035/windowssdk/winsdksetup.exe"
+$package = "C:\Windows\Temp\winsdksetup.exe"
+$sha1 = "db237323f1779fb143e7cdc558e4345e7004489e"
 
-echo "Installing Wayland $version $sha1 on RHEL"
+Copy-Item $url_cache $package
+Verify-Checksum $package $sha1
+Run-Executable $package "/features + /q"
 
-targetFile="/tmp/$archive"
-DownloadURL $primaryUrl $cacheUrl $sha1 $targetFile
-tar xf $targetFile --directory /tmp/
-rm $targetFile
+Write-Host "Cleaning $package.."
+Remove-Item -Recurse -Force -Path "$package"
 
-cd /tmp/wayland-$version
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --disable-static \
-    --disable-documentation
-make
-sudo make install
-rm -rf /tmp/wayland-$version
-
-echo "wayland = $version" >> ~/versions.txt
+Write-Output "Windows 10 SDK = 10.0.16229.91" >> ~\versions.txt

coin/provisioning/common/windows/winrtrunner.ps1

@@ -1,11 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$zip = "c:\users\qt\downloads\winrtrunner.zip"
-$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip"
-
-Download $url $url $zip
-Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42"
-Extract-Zip $zip C:\Utils\winrtrunner
-Remove-Item -Path $zip
-
-Set-EnvironmentVariable "CI_WINRTRUNNER_PATH" "C:\Utils\winrtrunner"

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

@@ -40,3 +40,5 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 if [ "$http_proxy" != "" ]; then
     echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
 fi
+
+sudo yum update -y nss curl

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

@@ -5,7 +5,7 @@ set -ex
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/shared/sw_versions.txt
 VERSION=$libclang_version
-URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
+URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
 SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
 
 $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

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

@@ -33,19 +33,32 @@
 ##
 #############################################################################
 
-sudo apt-get update
-sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev
+# Patch QNX SDK due to issues in the standard library.
+# The patches are available here:
+# http://www.qnx.com/download/feature.html?programid=27555
+# A copy of the patch must be in the root of the Coin path in
+# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
 
-TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
-trap "sudo rm -fr $TEMPDIR" EXIT
-cd $TEMPDIR
-git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua
-cd freeopcua
-git checkout 955cc5b924cf310fc15b376a11f4b7b9db28980b
-mkdir build
-cd build
-source ~/.profile
-cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
-make
-sudo make install
-sudo /sbin/ldconfig
+set -ex
+sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
+
+function InstallZipPackageFromURL {
+    url=$1
+    expectedSha1=$2
+    targetDirectory=$3
+
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    echo "$expectedSha1  $targetFile" | sha1sum --check
+
+    tempDir=`mktemp -d`
+    /usr/bin/unzip -o -d $tempDir $targetFile
+    trap "sudo rm -fr $targetFile $tempDir" EXIT
+
+    sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
+}
+
+echo "Patching QNX"
+
+baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip"
+InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"

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

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

@@ -35,4 +35,42 @@
 
 set -ex
 
-sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms
+echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf
+sudo systemctl stop packagekit
+sudo systemctl disable packagekit
+
+sudo subscription-manager config --rhsm.manage_repos=0
+sudo subscription-manager refresh
+
+sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
+[rhel-7-workstation-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 7 Workstation (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+
+[rhel-7-workstation-optional-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-optional-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 7 Workstation - Optional (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+
+[rhel-workstation-rhscl-7-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-workstation-rhscl-7-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Software Collections RPMs for Red Hat Enterprise Linux 7 Workstation
+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

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

@@ -35,7 +35,6 @@
 
 set -ex
 
-sudo yum-config-manager --enable rhel-server-rhscl7-rpms
 sudo yum -y install devtoolset-4
 
 echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc

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

@@ -2,10 +2,10 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the test suite of the Qt Toolkit.
+## This file is part of the provisioning scripts of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -33,32 +33,18 @@
 ##
 #############################################################################
 
-echo "Sourcing try_catch.sh"
+set -ex
 
-function try()
-{
-    [[ $- = *e* ]]; SAVED_OPT_E=$?
-    set +e
-}
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
-function throw()
-{
-    exit "$1"
-}
+package="epel-release-7-11.noarch.rpm"
+primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
+cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
+sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
+targetFile="/tmp/$package"
 
-function catch()
-{
-    export ex_code=$?
-    (( SAVED_OPT_E )) && set +e
-    return $ex_code
-}
+DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
 
-function throwErrors()
-{
-    set -e
-}
+sudo rpm -ivh "$targetFile"
+rm "$targetFile"
 
-function ignoreErrors()
-{
-    set +e
-}

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

@@ -48,7 +48,6 @@ installPackages+=(mesa-libGL-devel)
 installPackages+=(libxkbfile-devel)
 # Xinput2
 installPackages+=(libXi-devel)
-installPackages+=(python-devel)
 installPackages+=(mysql-server)
 installPackages+=(mysql)
 installPackages+=(mysql-devel)
@@ -61,11 +60,13 @@ installPackages+=(gstreamer1-plugins-base-devel)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
-installPackages+=(libusb-devel)
+installPackages+=(libusbx-devel)
 # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
 installPackages+=(speech-dispatcher-devel)
-# Python
-installPackages+=(python-devel python-virtualenv)
+# Python 2 devel and pip. python-pip requires the EPEL repository to be added
+installPackages+=(python-devel python-pip)
+# Python 3 with python-devel, pip and virtualenv
+installPackages+=(rh-python36)
 # WebEngine
 installPackages+=(bison)
 installPackages+=(flex)
@@ -83,11 +84,12 @@ installPackages+=(perl-Digest-SHA)
 installPackages+=(glibc.i686)
 # Enable Qt Bluetooth
 installPackages+=(bluez-libs-devel)
-# QtWebKit
-installPackages+=(libxml2-devel)
-installPackages+=(libxslt-devel)
-# For building Wayland from source
-installPackages+=(libffi-devel)
 
-sudo yum -y update
 sudo yum -y install "${installPackages[@]}"
+
+sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3
+sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
+# We shouldn't use yum to install virtualenv. The one found from package repo is not
+# working, but we can use installed pip
+sudo pip install --upgrade pip
+sudo pip install virtualenv

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

@@ -35,21 +35,9 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
 name="p7zip"
 version="7-11"
-package="epel-release-$version.noarch.rpm"
-primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
-cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
-sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
-targetFile="/tmp/$package"
-
-DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
-
-sudo rpm -ivh "$targetFile"
 sudo yum -y install "$name"
-sudo rm "$targetFile"
 
 # Link 7za to 7z so we can use existing installation scripts
 sudo ln -s /usr/bin/7za /usr/bin/7z

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

@@ -4,7 +4,7 @@ set -ex
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/shared/sw_versions.txt
 VERSION=$libclang_version
-URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
+URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
 SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
 
 $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh

@@ -1,36 +0,0 @@
-#!/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%/*}/../common/linux/open62541.sh"

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

@@ -37,69 +37,25 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 NTS_IP=10.212.2.216
 
-ExceptionGsettings1=100
-ExceptionGsettings2=101
-ExceptionGsettings3=102
-ExceptionNTS=103
-ExceptionProxy=104
-ExceptionGrub=105
+echo "Set timezone to UTC."
+sudo timedatectl set-timezone Etc/UTC
+echo "Timeout for blanking the screen (0 = never)"
+gsettings set org.gnome.desktop.session idle-delay 0
+echo "Prevents screen lock when screesaver goes active."
+gsettings set org.gnome.desktop.screensaver lock-enabled false
+echo "Disable questions on shutdown."
+gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
+echo "Set grub timeout to 0"
+sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
+sudo update-grub
 
-try
-(
-    echo "Set timezone to UTC."
-    sudo timedatectl set-timezone Etc/UTC  || throw $ExceptionTimezone
-    echo "Timeout for blanking the screen (0 = never)"
-    gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1
-    echo "Prevents screen lock when screesaver goes active."
-    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
-
-    if [ "$http_proxy" != "" ]; then
-        echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy
-    fi
-)
-catch || {
-    case $ex_code in
-        $ExceptionTimezone)
-            echo "Failed to set timezone to UTC"
-            exit 1;
-        ;;
-        $ExceptionGsettings1)
-            echo "Failed to disable black screen."
-            exit 1;
-        ;;
-        $ExceptionGsettings2)
-            echo "Failed to prevent screen lock."
-            exit 1;
-        ;;
-        $ExceptionGsettings3)
-            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;
-        ;;
-        $ExceptionProxy)
-            echo "Failed to set proxy /etc/apt/apt.conf."
-            exit 1;
-        ;;
-    esac
-}
+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
 
+if [ "$http_proxy" != "" ]; then
+    echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf
+fi

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

@@ -37,153 +37,130 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
+echo "Disabling auto update"
+sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic
+for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do
+    sudo systemctl stop $service
+    sudo systemctl disable $service
+done
 
-ExceptionAPTUpdate=100
-ExceptionAPT=101
-ExceptionSED=102
+# aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock)
+for i in `seq 10`; do
+    echo attempting to remove aptdaemon
+    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true
+    # check that aptdaemon is no longer installed
+    which aptd > /dev/null || break
+    if [[ $i -eq 10 ]]; then
+        exit 1
+    fi
+    sleep 10
+done
 
-try
-(
-    echo "Disabling auto update"
-    sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED
-    for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do
-        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-full)
+# To be able to mount yocto-cache during builds
+installPackages+=(nfs-common)
+# 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)
+# python2 development package
+installPackages+=(python-pip)
+# python3 development package
+installPackages+=(python3-dev)
+installPackages+=(python3-pip)
+installPackages+=(python3-virtualenv)
+# Needed to be able to build Yocto
+installPackages+=(chrpath)
+installPackages+=(gawk)
+installPackages+=(texinfo)
+# 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+=(zlib1g:i386)
+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)
+#Pypdf for QSR documentation
+installPackages+=(python-pypdf2)
 
-    # aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock)
-    for i in `seq 10`; do
-        echo attempting to remove aptdaemon
-        sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true
-        # check that aptdaemon is no longer installed
-        which aptd > /dev/null || break
-        if [[ $i -eq 10 ]]; then
-            throw $ExceptionAPT
-        fi
-        sleep 10
-    done
-
-    # Git is not needed by builds themselves, but is nice to have
-    # immediately as one starts debugging
-    installPackages+=(git)
-    # 7zip is a needed decompressing tool
-    installPackages+=(p7zip-full)
-    # To be able to mount yocto-cache during builds
-    installPackages+=(nfs-common)
-    # 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)
-    # python2 development package
-    installPackages+=(python-pip)
-    # python3 development package
-    installPackages+=(python3-dev)
-    installPackages+=(python3-pip)
-    installPackages+=(python3-virtualenv)
-    # Needed to be able to build Yocto
-    installPackages+=(chrpath)
-    installPackages+=(gawk)
-    installPackages+=(texinfo)
-    # 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"
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" || throw $ExceptionAPT
-)
-catch || {
-    case $ex_code in
-        $ExceptionAPTUpdate)
-            echo "Failed to run APT update."
-            exit 1;
-        ;;
-        $ExceptionAPT)
-            echo "Failed to install package."
-            sudo lsof /var/lib/dpkg/lock
-            exit 1;
-        ;;
-        $ExceptionSED)
-            echo "Failed to disable auto update."
-            exit 1;
-        ;;
-    esac
-}
+echo "Running update for apt"
+sudo apt-get update
+echo "Installing packages"
+sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh

@@ -94,10 +94,4 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i
 sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i
 
 # Set QEMU font configuration variables
-qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE"
-qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH"
-
-# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173)
-qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1"
-
-SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\""
+SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\""

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

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-. $BASEDIR/../common/shared/sw_versions.txt
-VERSION=$libclang_version
-URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
-SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
-
-$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

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

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 echo "Installing Yocto toolchain for 32-bit b2qt..."
 
-versionARM="2.3.1"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-41b0b46.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
-SHA1="f17cce550c9d2148f11ae5c760f43a67e9813a45"
+versionARM="2.2.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2c947f7.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package"
+SHA1="2583ae29951954cb27f12400fcb4ee94738d1430"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/yocto-armv7"
 sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
@@ -60,11 +60,11 @@ rm -rf "$yoctoInstaller"
 
 echo "Installing Yocto toolchain for 64-bit b2qt..."
 
-versionARM64="2.3.1"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-41b0b46.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
-SHA1="b49d7ec8a6339dda5a82815dc31fed1fae00851d"
+versionARM64="2.2.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2c947f7.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package"
+SHA1="512b5bc1ad62af88d021eb511eeac4648d661fc6"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/yocto-arm64"
 sysrootARM64="sysroots/aarch64-poky-linux"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the 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%/*}/../common/unix/mqtt_broker.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
-source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

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
@@ -17,8 +14,6 @@ echo "Set DISPLAY"
 echo 'export DISPLAY=":0"' >> ~/.bashrc
 echo "Disabling file indexing."
 sudo balooctl disable
-echo "Disable update notifications"
-sudo zypper -nq remove plasma5-pk-updates
 
 if [ "$http_proxy" != "" ]; then
     sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy

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

@@ -3,12 +3,9 @@
 set -ex
 
 sudo zypper -nq install git
-sudo zypper -nq install gcc7
-sudo zypper -nq install gcc7-c++
-sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \
-                                     --slave /usr/bin/g++ g++ /usr/bin/g++-7 \
-                                     --slave /usr/bin/cc cc /usr/bin/gcc-7 \
-                                     --slave /usr/bin/c++ c++ /usr/bin/g++-7
+# default compiler, gcc 4.8.5
+sudo zypper -nq install gcc
+sudo zypper -nq install gcc-c++
 
 sudo zypper -nq install bison
 sudo zypper -nq install flex
@@ -20,7 +17,6 @@ sudo zypper -nq install glib2-devel
 sudo zypper -nq install libopenssl-devel
 sudo zypper -nq install freetype2-devel
 sudo zypper -nq install fontconfig-devel
-sudo zypper -nq install sqlite3-devel
 
 # EGL support
 sudo zypper -nq install Mesa-libEGL-devel
@@ -52,13 +48,5 @@ sudo zypper -nq install libXtst-devel
 sudo zypper -nq install mozilla-nspr-devel
 sudo zypper -nq install mozilla-nss-devel
 
-# qtwebkit
-sudo zypper -nq install libxml2-devel
-sudo zypper -nq install libxslt-devel
-
-# GStreamer (qtwebkit and qtmultimedia)
-sudo zypper -nq install gstreamer-devel
-sudo zypper -nq install gstreamer-plugins-base-devel
-
 # cups
 sudo zypper -nq install cups-devel

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

@@ -5,7 +5,7 @@ set -ex
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/shared/sw_versions.txt
 VERSION=$libclang_version
-URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
+URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
 SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
 
 $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

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

@@ -9,4 +9,4 @@ sudo pkcon -y refresh
 sudo pkcon -y install python-devel python-virtualenv
 
 # install python3
-sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv
+sudo pkcon -y install python3 python3-pip python3-devel python3-virtualenv

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the 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%/*}/../common/unix/mqtt_broker.sh"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh

@@ -1,36 +0,0 @@
-#!/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%/*}/../common/linux/open62541.sh"

coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh

@@ -0,0 +1 @@
+../common/macos/sha1sum-compatibility.sh

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

@@ -37,33 +37,19 @@ set -ex
 
 # This script modified system settings for automated use
 
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-
 VNCPassword=qt
 NTS_IP=10.212.2.216
 
-ExceptionDisableScreensaver=100
-ExceptionSetInitialDelay=101
-ExceptionSetDelay=102
-ExceptionVNC=103
-ExceptionNTS=104
-ExceptionDisableScreensaverPassword=105
-ExceptionDisableSleep=106
+echo "Disable Screensaver"
+# For current session
+defaults -currentHost write com.apple.screensaver idleTime 0
 
-try
-(
-    echo "Disable Screensaver"
-    # For current session
-    defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver
+echo "Disable sleep"
+sudo pmset sleep 0 displaysleep 0
 
-    echo "Disable sleep"
-    sudo pmset sleep 0 displaysleep 0 || throw $ExceptionDisableSleep
-
-    # For session after a reboot
-    mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver
-    (
-        cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
+# For session after a reboot
+mkdir -p "$HOME/Library/LaunchAgents"
+cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 
@@ -87,53 +73,17 @@ try
     </dict>
 </plist>
 EOT
-    ) || throw $ExceptionDisableScreensaver
 
-    defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword
+defaults write com.apple.screensaver askForPassword -int 0
 
-    echo "Set keyboard type rates and delays"
-    # normal minimum is 15 (225 ms)
-    defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
-    # normal minimum is 2 (30 ms)
-    defaults write -g KeyRepeat -int 2 || throw $ExceptionSetDelay
+echo "Set keyboard type rates and delays"
+# normal minimum is 15 (225 ms)
+defaults write -g InitialKeyRepeat -int 15
+# normal minimum is 2 (30 ms)
+defaults write -g KeyRepeat -int 2
 
-    echo "Enable remote desktop sharing"
-    sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all || throw $ExceptionVNC
+echo "Enable remote desktop sharing"
+sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all
 
-    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
-
-)
-catch || {
-    case $ex_code in
-        $ExceptionDisableScreensaver)
-            echo "Failed to disable screensaver."
-            exit 1;
-        ;;
-        $ExceptionSetInitialDelay)
-            echo "Failed to set initial delay of keyboard."
-            exit 1;
-        ;;
-        $ExceptionSetDelay)
-            echo "Failed to set delay of keyboard."
-            exit 1;
-        ;;
-        $ExceptionVNC)
-            echo "Failed to enable VNC."
-            exit 1;
-        ;;
-        $ExceptionNTS)
-            echo "Failed to set NTS."
-            exit 1;
-        ;;
-        $ExceptionDisableScreensaverPassword)
-            echo "Failed to disable requiring of password after screensaver is enabled."
-            exit 1;
-        ;;
-        $ExceptionDisableSleep)
-            echo "Failed to disable sleep."
-            exit 1;
-        ;;
-
-    esac
-}
+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

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

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

@@ -39,7 +39,7 @@
 
 set -ex
 
-# shellcheck source=../common/unix/try_catch.sh
+# shellcheck source=../common/macos/InstallPKGFromURL
 source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"

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

@@ -44,10 +44,7 @@
 
 set -ex
 
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-
 # shellcheck source=../common/macos/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
+source "${BASH_SOURCE%/*}/../common/macos/install_xcode_9_orHigher.sh"
 
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2_updated.tar.gz 9.2

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

@@ -37,10 +37,10 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
 
-version="8.3.2"
-packageName="CommandLineToolsforXcode$version.dmg"
+version="9.2"
+packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe"
+sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version
 

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

@@ -39,8 +39,6 @@
 
 set -ex
 
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
@@ -64,57 +62,23 @@ toolsSourceFile="$basePath/$toolsFile"
 ndkTargetFile="/tmp/$ndkFile"
 ndkSourceFile="$basePath/$ndkFile"
 
-ExceptionUnzipTools=100
-ExceptionUnzipNdk=101
-ExceptionRmTools=102
-ExceptionRmNdk=103
-ExceptionSdkManager=104
+echo "Unzipping Android NDK to '$targetFolder'"
+sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
+echo "Unzipping Android Tools to '$sdkTargetFolder'"
+sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
 
-try
-(
-    echo "Unzipping Android NDK to '$targetFolder'"
-    sudo unzip -q "$ndkSourceFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
-    echo "Unzipping Android Tools to '$sdkTargetFolder'"
-    sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
+echo "Changing ownership of Android files."
+sudo chown -R qt:wheel "$targetFolder"
 
-    echo "Changing ownership of Android files."
-    sudo chown -R qt:wheel "$targetFolder"
+echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
+(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 
-    echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
-    (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
-
-    SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
-    SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
-    SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
-    SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
-
-    echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
-    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
-    echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
-    echo "Android NDK = $ndkVersion" >> ~/versions.txt
-)
-catch || {
-        case $ex_code in
-            $ExceptionUnzipTools)
-                echo "Failed to unzip Android SDK Tools."
-                exit 1;
-            ;;
-            $ExceptionUnzipNdk)
-                echo "Failed to unzip Android NDK."
-                exit 1;
-            ;;
-            $ExceptionRmTools)
-                echo "Failed to remove temporary tools package '$toolsTargetFile'."
-                exit 1;
-            ;;
-            $ExceptionRmNdk)
-                echo "Failed to remove temporary NDK package '$ndkTargetFile'."
-                exit 1;
-            ;;
-            $ExceptionSdkManager)
-                echo "Failed to run sdkmanager."
-                exit 1;
-            ;;
-        esac
-}
+SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
+SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
+SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 
+echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+echo "Android NDK = $ndkVersion" >> ~/versions.txt

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

@@ -37,85 +37,40 @@
 
 set -ex
 
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
 # shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
-opensslVersion="1.0.2k"
+opensslVersion="1.0.2t"
 opensslFile="openssl-$opensslVersion.tar.gz"
 opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
 opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44"
+opensslSha1="8ac3fd379cf8c8ef570abb51ec52a88fd526f88a"
 
 # Below target location has been hard coded into Coin.
 # QTQAINFRA-1195
 opensslTargetLocation="/usr/local/opt/openssl"
 
-ExceptionCD=100
-ExceptionConfig=101
-ExceptionMake=102
-ExceptionInstall=103
-ExceptionLN=104
-ExceptionCertificate=105
-ExceptionCleanup=106
+InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
+cd "/tmp/openssl-$opensslVersion"
+pwd
+sudo ./config --prefix=/usr/local/openssl-$opensslVersion
+echo "Running 'make' for OpenSSL"
+sudo make --silent > /tmp/openssl_make.log 2>&1
+echo "Running 'make install' for OpenSSL"
+sudo make --silent install > /tmp/openssl_make_install.log 2>&1
 
-try
-(
-    InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
-    cd "/tmp/openssl-$opensslVersion" || throw $ExceptionCD
-    pwd
-    sudo ./config --prefix=/usr/local/openssl-$opensslVersion || throw $ExceptionConfig
-    echo "Running 'make' for OpenSSL"
-    sudo make --silent > /tmp/openssl_make.log 2>&1 || throw $ExceptionMake
-    echo "Running 'make install' for OpenSSL"
-    sudo make --silent install > /tmp/openssl_make_install.log 2>&1 || throw $ExceptionInstall
+path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
+sudo mkdir -p "$path"
+sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation
 
-    path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
-    sudo mkdir -p "$path"
-    sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation || throw $ExceptionLN
+SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
+SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
 
-    SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
-    SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
+security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
+security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
 
-    security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate
-    security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate
+sudo rm -rf /tmp/openssl-$opensslVersion
 
-    sudo rm -rf /tmp/openssl-$opensslVersion || throw $ExceptionCleanup
-
-    echo "OpenSSL = $opensslVersion" >> ~/versions.txt
-)
-catch || {
-    case $ex_code in
-        $ExceptionCD)
-            echo "Failed to change directory to /tmp/openssl-$opensslVersion."
-            exit 1;
-        ;;
-        $ExceptionConfig)
-            echo "Failed to run config for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionMake)
-            echo "Failed to run 'make' for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionInstall)
-            echo "Failed to run 'make install' for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionLN)
-            echo "Failed to create a soft link for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionCertificate)
-            echo "Failed to install Certificate for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionCleanup)
-            echo "Failed to clean up /tmp/openssl-$opensslVersion."
-            exit 1;
-        ;;
-    esac
-}
+echo "OpenSSL = $opensslVersion" >> ~/versions.txt

coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh

@@ -1,79 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script installs QNX 7.
-
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-
-targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip"
-folderName="qnx700"
-
-ExceptionExtract=100
-ExceptionExtract2=101
-
-
-try
-(
-    sudo mkdir -p "$targetFolder"
-
-    echo "Extracting QNX 7"
-    sudo unzip -q "$sourceFile" -d "$targetFolder" || throw $ExceptionExtract
-
-    sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-    # Verify that we have last file in zip
-    if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-        throw $ExceptionExtract2
-    fi
-
-    # Set env variables
-    echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
-    echo "QNX SDP = 7.0.0" >> ~/versions.txt
-)
-catch || {
-        case $ex_code in
-            $ExceptionExtract)
-                echo "Failed to unzip QNX 7."
-                exit 1;
-            ;;
-            $ExceptionExtract2)
-                echo "The last file in the zip did not get extracted."
-                exit 1;
-            ;;
-        esac
-}
-

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

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

coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh

@@ -0,0 +1 @@
+../common/macos/sha1sum-compatibility.sh

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

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

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

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"

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

@@ -0,0 +1,28 @@
+#!/usr/bin/env sh
+
+set -ex
+
+mkdir -p $HOME/Library/LaunchAgents
+cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Label</key>
+        <string>org.qt.io.screensaver_disable</string>
+        <key>ProgramArguments</key>
+        <array>
+            <string>defaults</string>
+            <string>-currentHost</string>
+            <string>write</string>
+            <string>com.apple.screensaver</string>
+            <string>idleTime</string>
+            <string>0</string>
+        </array>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>KeepAlive</key>
+        <false/>
+    </dict>
+</plist>
+EOT

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

@@ -0,0 +1,7 @@
+#!/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

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/pip.sh
+$BASEDIR/../common/macos/cmake.sh

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

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

@@ -0,0 +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/unix/libclang.sh

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

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

coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh

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

coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh

@@ -0,0 +1 @@
+../common/macos/sha1sum-compatibility.sh

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

@@ -37,33 +37,19 @@
 
 set -ex
 
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-
 VNCPassword=qt
 NTS_IP=10.212.2.216
 
-ExceptionDisableScreensaver=100
-ExceptionSetInitialDelay=101
-ExceptionSetDelay=102
-ExceptionVNC=103
-ExceptionNTS=104
-ExceptionDisableScreensaverPassword=105
-ExceptionDisableSleep=106
+echo "Disable Screensaver"
+# For current session
+defaults -currentHost write com.apple.screensaver idleTime 0
 
-try
-(
-    echo "Disable Screensaver"
-    # For current session
-    defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver
+echo "Disable sleep"
+sudo pmset sleep 0 displaysleep 0
 
-    echo "Disable sleep"
-    sudo pmset sleep 0 displaysleep 0 || throw $ExceptionDisableSleep
-
-    # For session after a reboot
-    mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver
-    (
-        cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
+# For session after a reboot
+mkdir -p "$HOME/Library/LaunchAgents"
+cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 
@@ -87,54 +73,18 @@ try
     </dict>
 </plist>
 EOT
-    ) || throw $ExceptionDisableScreensaver
 
-    defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword
+defaults write com.apple.screensaver askForPassword -int 0
 
-    echo "Set keyboard type rates and delays"
-    # normal minimum is 15 (225 ms)
-    defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
-    # normal minimum is 2 (30 ms)
-    defaults write -g KeyRepeat -int 2 || throw $ExceptionSetDelay
+echo "Set keyboard type rates and delays"
+# normal minimum is 15 (225 ms)
+defaults write -g InitialKeyRepeat -int 15
+# normal minimum is 2 (30 ms)
+defaults write -g KeyRepeat -int 2
 
-    echo "Enable remote desktop sharing"
-    sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all || throw $ExceptionVNC
+echo "Enable remote desktop sharing"
+sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all
 
-    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
-
-)
-catch || {
-    case $ex_code in
-        $ExceptionDisableScreensaver)
-            echo "Failed to disable screensaver."
-            exit 1;
-        ;;
-        $ExceptionSetInitialDelay)
-            echo "Failed to set initial delay of keyboard."
-            exit 1;
-        ;;
-        $ExceptionSetDelay)
-            echo "Failed to set delay of keyboard."
-            exit 1;
-        ;;
-        $ExceptionVNC)
-            echo "Failed to enable VNC."
-            exit 1;
-        ;;
-        $ExceptionNTS)
-            echo "Failed to set NTS."
-            exit 1;
-        ;;
-        $ExceptionDisableScreensaverPassword)
-            echo "Failed to disable requiring of password after screensaver is enabled."
-            exit 1;
-        ;;
-        $ExceptionDisableSleep)
-            echo "Failed to disable sleep."
-            exit 1;
-        ;;
-
-    esac
-}
+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
 

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

coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh

@@ -39,7 +39,7 @@
 
 set -ex
 
-# shellcheck source=../common/unix/try_catch.sh
+# shellcheck source=../common/macos/InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg"

coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh

@@ -44,9 +44,6 @@
 
 set -ex
 
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"