Merge remote-tracking branch 'origin/5.12.8' into 5.12

Conflicts:
	.gitmodules

Change-Id: I5a3c7de3adc990e1294bb0fde461ddd4e1557b37

.gitmodules

@@ -1,60 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.15
+	branch = 5.12
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.15
+	branch = 5.12
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.15
+	branch = 5.12
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.15
+	branch = 5.12
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.15
+	branch = 5.12
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.15
-	status = deprecated
+	branch = 5.12
+	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.15
+	branch = 5.12
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -62,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.15
+	branch = 5.12
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,204 +123,185 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtserialbus"]
-	depends = qtbase
-	recommends = qtserialport
+	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = dev
-	status = ignore
+	branch = 5.12
+	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.15
+	branch = 5.12
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.15
+	branch = 5.12
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.15
-	status = addon
-[submodule "qtlottie"]
-	depends = qtbase qtdeclarative
-	path = qtlottie
-	url = ../qtlottie.git
-	branch = 5.15
-	status = addon
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 5.15
-	status = addon
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 5.15
+	branch = 5.12
 	status = addon

_clang-format

@@ -42,7 +42,7 @@ BraceWrapping:
     AfterFunction: true
     AfterNamespace: false
     AfterObjCDeclaration: false
-    AfterStruct: true
+    AfterStruct: false
     AfterUnion: false
     BeforeCatch: false
     BeforeElse: false

coin/platform_configs/default.yaml

@@ -1,149 +1,181 @@
-Version: 2
-Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Compiler: 'MSVC2015'
-    Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
 -
     Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
+    Compiler: 'Mingw73'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target arch: 'x86'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Compiler: 'MSVC2015'
-    Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
+    Features: ['Packaging']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'WinRT_10'
     Target arch: 'x86'
     Compiler: 'MSVC2015'
     Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'WinRT_10'
     Target arch: 'armv7'
     Compiler: 'MSVC2015'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-17'
-    Compiler: 'MSVC2019'
+    Template: 'qtci-windows-10-x86_64-10'
+    Compiler: 'MSVC2017'
     Features: ['Packaging']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
 -
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Template: 'qtci-windows-10-x86_64-10'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Mingw73'
+    Target compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86'
+-
+    Template: 'qtci-linux-Ubuntu-16.04-x86_64-2'
     Compiler: 'GCC'
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
     Features: ['OutOfSourceBuild', 'Documentation']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-openSUSE-42.3-x86_64'
     Compiler: 'GCC'
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-openSUSE-42.3-x86_64'
     Compiler: 'ICC_18'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-openSUSE-42.3-x86_64'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
+-
+    Template: 'qtci-linux-SLES-12-x86_64'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
     Template: 'qtci-linux-SLES-15-x86_64'
     Compiler: 'GCC'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
     Compiler: 'GCC'
     Features: ['Packaging']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
 -
     Template: 'qtci-macos-10.13-x86_64-2'
     Compiler: 'Clang'
     Features: ['Packaging']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
 -
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
     Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
+-
+    Template: 'qtci-macos-10.12-x86_64-9'
+    Compiler: 'Clang'
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
 -
-    Template: 'qtci-macos-10.14-x86_64'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'IOS_ANY'
     Target arch: 'multi'
     Compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
-    Target os: 'Android_ANY'
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Target os: 'TvOS_ANY'
     Target arch: 'multi'
     Compiler: 'Clang'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Target os: 'WatchOS_ANY'
+    Target arch: 'multi'
+    Compiler: 'Clang'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Clang'
     Target compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86'
+-
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Target os: 'QEMU'
     Target arch: 'arm64'
     Compiler: 'GCC'
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Target os: 'QEMU'
-    Target arch: 'mips64'
-    Compiler: 'GCC'
-    Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck']
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
     Target os: 'INTEGRITY_11_04'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6'
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
     Target os: 'QNX_700'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc'

coin/platform_configs/flashing-wizard.yaml

@@ -1,23 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-    -
-        Template: 'qtci-windows-10-x86_64-17'
-        Compiler: 'MSVC2019'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-    -
-        Template: 'qtci-windows-10-x86_64-17'
-        Compiler: 'MSVC2019'
-        Target arch: 'x86'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-    -
-        Template: 'qtci-linux-RHEL-7.6-x86_64'
-        Compiler: 'GCC'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-    -
-        Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck']

coin/platform_configs/installer-framework.yaml

@@ -0,0 +1,30 @@
+Version: 2
+Module only: True
+Configurations:
+-
+    Template: 'qtci-windows-10-x86_64-10'
+    Compiler: 'MSVC2015'
+    Target arch: 'x86'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install'
+    Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;']
+    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'
+-
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked  -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs'
+-
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
+    Compiler: 'GCC'
+    Features: ['Documentation', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -qt-zlib -qt-libpng -qt-libjpeg -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheck']

coin/platform_configs/meta-boot2qt.yaml

@@ -1,40 +0,0 @@
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET1'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET2'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET3'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET4'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET5'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET6'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET7'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET8'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET9'
--
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'Yocto'
-    Target arch: 'TARGET10'

coin/platform_configs/qdb.yaml

@@ -1,28 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-    -
-        Template: 'qtci-windows-10-x86_64-17'
-        Compiler: 'MSVC2015'
-        Target arch: 'x86'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%'
-    -
-        Template: 'qtci-windows-10-x86_64-17'
-        Compiler: 'MSVC2015'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%'
-    -
-        Template: 'qtci-linux-RHEL-7.6-x86_64'
-        Compiler: 'GCC'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-    -
-        Template: 'qtci-macos-10.13-x86_64-2'
-        Compiler: 'Clang'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
-    -
-        Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck']

coin/platform_configs/qt5.yaml

@@ -1,115 +1,126 @@
-Version: 2
-Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'WinRT_10'
     Compiler: 'MSVC2015'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'WinRT_10'
     Target arch: 'x86'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x86-msvc2019 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017'
 -
     Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
+    Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-17'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+    Template: 'qtci-windows-10-x86_64-10'
+    Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'WinRT_10'
     Target arch: 'armv7'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'WinRT_10'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
     Target os: 'Android_ANY'
-    Target arch: 'multi'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Target compiler: 'Clang'
-    Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -qt-zlib'
--
-    Template: 'qtci-macos-10.13-x86_64-2'
-    Target os: 'Android_ANY'
-    Target arch: 'multi'
+    Target arch: 'armv7'
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang'
+-
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
+-
+    Template: 'qtci-windows-10-x86_64-10'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Mingw73'
+    Target compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a'
+-
+    Template: 'qtci-windows-10-x86_64-10'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Mingw73'
+    Target compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a'
 -
     Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'QNX_700'
     Target arch: 'x86'
     Compiler: 'GCC'
     Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'QNX_700'
     Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
+    Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'QNX_700'
     Target arch: 'armv8'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
+    Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'QNX_700'
     Target arch: 'x86_64'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
+    Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc'
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
     Target os: 'QNX_700'
     Target arch: 'armv8'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc'
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
     Target os: 'QNX_700'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc'
--
-    Template: 'qtci-windows-10-x86_64-17'
-    Target os: 'WebAssembly'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten -qt-zlib'
--
-    Template: 'qtci-macos-10.13-x86_64-2'
-    Target os: 'WebAssembly'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake examples -nomake  tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -xplatform wasm-emscripten'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc'

coin/platform_configs/qtbase.yaml

@@ -4,7 +4,7 @@
     Target arch: 'armv7'
     Compiler: 'GCC'
     Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Target os: 'QEMU'
@@ -13,13 +13,13 @@
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'WinRT_10'
     Target arch: 'x86_64'
     Compiler: 'MSVC2015'
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-openSUSE-42.3-x86_64'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Features: ['DisableTests']

coin/platform_configs/qtconnectivity.yaml

@@ -1,5 +1,5 @@
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-10'
     Target os: 'WinRT_10'
     Target arch: 'x86_64'
     Compiler: 'MSVC2015'

coin/platform_configs/qtdeclarative.yaml

@@ -3,7 +3,7 @@
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Target os: 'QEMU'
@@ -15,7 +15,7 @@
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
-    Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose'
+    Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Target os: 'QEMU'

coin/platform_configs/qtsaferenderer.yaml

@@ -1,18 +1,14 @@
-Version: 2
-Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-17'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+    Template: 'qtci-windows-10-x86_64-10'
+    Compiler: 'Mingw73'
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-17'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+    Template: 'qtci-windows-10-x86_64-10'
+    Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-RHEL-7.4-x86_64'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'

coin/platform_configs/qtsdk.yaml

@@ -1,13 +1,8 @@
 -
     Template: 'qtci-windows-10-x86-3'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
 -
     Template: 'qtci-linux-RHEL-6.6-x86_64'
     Compiler: 'GCC'
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests'
--
-    Template: 'qtci-windows-8.1-x86'
-    Compiler: 'MSVC2015'
-    Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'

coin/platform_configs/qtwebkit.yaml

@@ -1,8 +1,5 @@
-Version: 2
-Configurations:
 -
     Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
+    Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'

coin/platform_configs/tqtc-qt-config-gui.yaml

@@ -1,28 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-    -
-        Template: 'qtci-windows-10-x86_64-17'
-        Compiler: 'MSVC2019'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-    -
-        Template: 'qtci-windows-10-x86_64-17'
-        Compiler: 'MSVC2019'
-        Target arch: 'x86'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-    -
-        Template: 'qtci-linux-RHEL-7.6-x86_64'
-        Compiler: 'GCC'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-    -
-        Template: 'qtci-macos-10.13-x86_64-2'
-        Compiler: 'Clang'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
-    -
-        Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck']

coin/platform_configs/tqtc-qt-rta.yaml

@@ -10,5 +10,5 @@
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
 -
     Template: 'qtci-windows-10-x86-3'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'

coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## 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.

coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## 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.

coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## 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.

coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1

@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+
+$version = "2017_version_15.0"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt

coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,50 +0,0 @@
-# List about manual pre-installations to Tier1 image:
-
-Virtual Hardware:
-CPU: 4
-Memory: 8 GB
-Hard Disk: 550 GB
-CI_NW
-Video Card - total memory: 32MB
-
-VM Options:
-Boot options/Firmware: BIOS
-
-Language: English US
-Keyboard: finnish
-location: finnish
-Windows 10 Enterprise
-Region: Finland
-Keyboard layout: Finnish
-
-* VMware tools (complete) installed
-* Resolution set to 1280x800
-* Coin-setup:
-   - Installing Boostrap agent
-   - Disabling fast boot
-   - Disabling firewall
-   - Disabling UAC
-   - Enabling autologin
-   - Automatic login
-   - Disabling windows updates
-* Windows Defender Antivirus turned off: Open 'gpedit.msc':  'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus'
-   - Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply'
-   - NOTE! Without this step windows defender can't be disabled!
-* Remote connections allowed:
-   - Enable Remote Desktop
-* Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule"
-   - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"'
-* Time zone: Coordinated Universal Time
-* Windows search disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'Windows search' - stop & disable
-* Sysmain disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'SysMain' - stop & disable
-* Power saver disabled: Open 'Power & sleep' and set 'Screen' to 'never'
-* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support
-* Google Chrome installed for RTA
-* Turn off Virus & threat protection (all sections) manually
-   - Real-tiem protection -> off
-   - Cloud-delivered protection -> off
-   - Automatic sample submission -> off
-   - Tamper protection -> off
-* Activate Windows
-* Modify 'Windows Software Development Kit - Windows 10.0.18362.1' from 'Add or remove programs'
-   - Add feature 'Debugging Tools for Windows'

coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1

@@ -1,8 +0,0 @@
-# This script will disable automatic disk cleanup
-
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
-
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F"
-
-# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space.
-DisableSchedulerTask "DiskCleanup\SilentCleanup"

coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1

@@ -1,72 +0,0 @@
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
-# thus needing its own version.
-Write-Host "Disabling defragmentation"
-$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption
-if ($version -like '*Windows 7*'){
-    $pi = New-Object System.Diagnostics.ProcessStartInfo
-    $pi.FileName = "C:\Windows\System32\schtasks.exe"
-    $pi.RedirectStandardError = $true
-    $pi.UseShellExecute  = $false
-    $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F"
-    $prog = New-Object System.Diagnostics.Process
-    $prog.StartInfo = $pi
-    $prog.Start() | Out-Null
-    $err = $prog.StandardError.ReadToEnd()
-    $prog.WaitForExit()
-    if ($prog.ExitCode -eq 0){
-        Write-Host "Scheduled defragmentation removed"
-    } else {
-        if ($err -like '*cannot find the file*'){
-            Write-Host "No scheduled defragmentation task found"
-            exit 0
-        } else {
-            Write-Host "Error while deleting scheduled defragmentation task: $err"
-        }
-    }
-}
-else {
-    try {
-        $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State
-        Write-Host "Scheduled defragmentation task found in state: $state"
-    }
-    catch {
-        Write-Host "No scheduled defragmentation task found"
-        exit 0
-    }
-    Write-Host "Unregistering scheduled defragmentation task"
-    Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag
-    Write-Host "Scheduled Defragmentation task was cancelled"
-}

coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1

@@ -1,4 +0,0 @@
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
-
-# Disable the NTP from syncing
-Run-Executable "w32tm.exe" "/config /syncfromflags:NO"

coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1

@@ -1,63 +0,0 @@
-###########################################################################
-##
-## 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$
-##
-#############################################################################
-
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-# NOTE! Windows Defender Antivirus needs to be turned off!
-#     Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus'
-#     Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply'
-
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
-
-Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
-Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F"
-
-# 'Windows Defender Cache Maintenance' - "Periodic maintenance task."
-DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance"
-
-# 'Windows Defender Cleanup' - "Periodic cleanup task."
-DisableSchedulerTask "Windows Defender\Windows Defender Cleanup"
-
-# 'Windows Defender Scheduled Scan' - "Periodic scan task."
-DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan"
-
-# 'Windows Defender Verification' - "Periodic verification task."
-DisableSchedulerTask "Windows Defender\Windows Defender Verification"
-
-# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports."
-DisableSchedulerTask "Windows Error Reporting\QueueReporting"
-
-# Disable WindowsUpdate from Task Scheduler
-DisableSchedulerTask "WindowsUpdate\Scheduled Start"

coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-update-medic.ps1

@@ -1,25 +0,0 @@
-# Windows Update Medic Service (WaaSMedicSvc)'PerformRemediation' helps recover update-related services to the supported configuration.
-# WaasMedicSvc keeps re-starting Windows Update, even if it disabled manually.
-# Even Admin user don't have privileged to disable PerformRemediation from Task Scheduler which means that WaaSMedicSvc.dll need's to be removed from the system
-
-$limit = (Get-Date).AddMinutes(20)
-$path = "C:\Windows\System32\WaaSMedicSvc.dll"
-
-DO {
-    takeown /F $path
-    icacls  $path /grant Administrators:f
-    Write-host "Deleting $path"
-
-    Try {
-        del $path
-    }
-    Catch [System.UnauthorizedAccessException] {
-        Write-host "Access to the path '$path' is denied."
-        Continue
-    }
-
-    if ((Get-Date) -gt $limit) {
-        exit 1
-    }
-
-}while (Test-Path -Path "$path")

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## 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.
@@ -30,22 +30,29 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
 
-# Visual Studio $version was installed manually using $installer.
-$version = "2015 update 3"
-$version_number ="14.0.25420.1"
-$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978"
+# Install Visual Studio $version with $update_version
+# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
+$version = "2015"
+$update_version = "3"
 
-# default plus following components were selected:
-# * Visual C++
-# * Universal Windows App Development Tools
-#   - Tools (1.4.1) and Windows SDK (10.0.14393)
-#   - Windows 10 SDK (10.0.10586)
-#   - Windows 10 SDK (10.0.10240)
-# * Common Tools
-#   -Visual Studio Extensibility Tools Update 3
+# Only way to install specific Visual studio release is to use feed.xml.
+# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx'
+# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates)
+$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml"
 
-# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
-$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"
+$msvc_web_installer = "vs" + $version + "_" + $update_version
+$package = "C:\Windows\temp\$msvc_web_installer.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
+$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
+$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
 
-echo "Visual Studio = $version version $version_number" >> ~\versions.txt
+echo "Fetching Visual Studio $version update $update_version..."
+Download $url_official $url_cache $package
+Verify-Checksum $package $sha1
+echo "Installing Visual studio $version update $update_version..."
+cmd /c "$package $parameters /norestart /Quiet"
+remove-item $package
+
+echo "Visual Studio = $version update $update_version" >> ~\versions.txt

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1

@@ -31,24 +31,19 @@
 ##
 #############################################################################
 
-# This script disables the automatic Windows updates
+. "$PSScriptRoot\..\common\helpers.ps1"
 
-$service = get-service wuauserv
-if (-not $service) {
-    Write-Host "Windows Update service not found."
-    exit 0
-}
+# This script will install Visual Studio 2017
 
-if ($service.Status -eq "Stopped") {
-    Write-Host "Windows Update service already stopped."
-} else {
-    Write-Host "Stopping Windows Update service."
-    Stop-Service -Name "wuauserv" -Force
-}
+$version = "2017"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
+$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
 
-$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
-if ($startup -ne "Disabled") {
-    set-service wuauserv -startup disabled
-} else {
-    Write-Host "Windows Update service startup already disabled."
-}
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio = $version" >> ~\versions.txt

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt

@@ -1,67 +0,0 @@
-# Visual Studio $version version $version_number was installed manually using $installer.
-
-$version = "2019"
-# Current version was manually upgraded from the installer
-$version_number = "16.4.4"
-$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
-
-MSVC 2019 build tools (default installation, no additional selections).
-    * Install after MSVC2019 is installed!
-    * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
-    * Version: 16.4.4
-
-Installed MSVC-2019 Components:
-
-.NET Framework 4.5 targeting pack
-.NET Framework 4.5.1 targeting pack
-.NET Framework 4.5.2 targeting pack
-.NET Framework 4.6.1 SDK
-.NET Framework 4.6.1 targeting pack
-.NET Framework 4.6.2 SDK
-.NET Framework 4.6.2 targeting pack
-.NET Framework 4.7.2 SDK
-.NET Framework 4.7.2 targeting pack
-.NET Native
-.NET Portable Library targeting pack
-CLR data typer for SQL Sever
-Connectivity and publishing tools
-Data sources for SQL Server support
-SQL ADAL runtime
-SQL Server Command Linne Utilities
-SQL Server Data Tools
-SQL Server Express 2016 LocalDB
-SQL Server ODBC Driver
-ClickOnce Publishing
-Developer Analytics tools
-NuGet package manager
-Text Template Transformation
-C# and Visual Basic Roslyn compilers
-C++ 2019 Redistributable Update
-C++ Cmake tools for Windows
-C++/CLI support for v142 build tools /14.24)
-MSBuild
-MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
-MSVC v142 - VS 2019 C++ ARM build tools (v14.24)
-MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
-MSVC v142 - VS 2019 C++ ARM64 build tools (v14.24)
-MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
-MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.24)
-.NET profiling tools
-C++ profiling tools
-JavaScript diagnostics
-Just-In-Time debugger
-C# and Visual Basic
-C++ core features
-JavaSript and TypeScript language support
-Razor Language Services
-Graphics debugger and GPU profiler for DirectX
-Image and 3D model editors
-C++ ATL for latest v142 build tools (x86 & x64)
-TypeScript 3.7 SDK
-Windows 10 SDK (10.0.16299.0)
-Windows 10 SDK (10.0.17134.0)
-Windows 10 SDK (10.0.17763.0)
-Windows 10 SDK (10.0.18362.0)
-
-# NOTE! Work loads were added during installation!
-

coin/provisioning/common/linux/android_linux.sh

@@ -37,8 +37,6 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
-set -e
-
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/check_and_set_proxy.sh
@@ -53,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="r26.1.1"
 toolsFile="sdk-tools-linux-4333796.zip"
-ndkVersion="r20"
+ndkVersion="r19c"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="28.0.3"
 sdkApiLevel="android-28"
 
 toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
-ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"
+ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -82,25 +80,14 @@ else
     sudo chown -R qt:users "$targetFolder"
 fi
 
-# Stop the sdkmanager from printing thousands of lines of #hashmarks.
-# Run the following command under `eval` or `sh -c` so that the shell properly splits it.
-sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
-# But don't let the pipeline hide sdkmanager failures.
-set -o pipefail
-
 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
 # shellcheck disable=SC2031
 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" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-        | eval $sdkmanager_no_progress_bar_cmd
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 else
-    echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager"  \
-                   "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-        | eval $sdkmanager_no_progress_bar_cmd
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 fi
 
 echo "Checking the contents of Android SDK..."
@@ -119,11 +106,8 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
 echo "Android NDK = $ndkVersion" >> ~/versions.txt
 
 cd "$sdkTargetFolder/tools/bin"
-./sdkmanager --install "emulator"  \
-    | eval $sdkmanager_no_progress_bar_cmd
-echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"  \
-    | eval $sdkmanager_no_progress_bar_cmd
-
+./sdkmanager --install "emulator"
+echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
 
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"

coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub

@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEyvJq8RBAD64FtKbU3VFsZ4PAzcSi9rETc1qXZLVQYtrE38niriIJUuT/tC
-kxGjkduD7ozP6rxL+M8fk9UdbbmzhHhXzQT2blyYy2iwpZP5+AFeQawz+oyMRVze
-x6IY5qO31TiRu+aEBptk6nco4DULlKABlvtjKI+gJ4buJm+TumyrPaxe9wCgpFwl
-O0fEjpOfQd+6Du0sCnPX7+8D/3xYVj9q5ILmrJ9zehBKjRYEcaP0rZVqudH51FUS
-I0LQNHsJdzKLzhT+Zj7TJU4KnCN4sX7amfYL3GT9qyZEBDx2alubvEsI36wtNq0i
-ewU4XmyZ+Rd7Q4mAPNoBGe5DsUA8wn/7iHGg9aJHu+GXvH7T3DVoUxW5W2KqPw+h
-jzqGBACWGuuCefa683uf6aKqpTS3JB+01BDPf+sG9qJ+k7xcJOsEiXIe1X5vH9ov
-kEvTM12kzY7SGwlsFsTDT1xioDl62g5nPlZMXErUBVnjoMtjl9bDwUPJY/vP1S9M
-VaONBMoJEON3HRui9jhdEK25LTdrcFlFpRzJI3AgdXwy8aQyiLRGZGV2ZWw6bGFu
-Z3VhZ2VzOmdvIE9CUyBQcm9qZWN0IDxkZXZlbDpsYW5ndWFnZXM6Z29AYnVpbGQu
-b3BlbnN1c2Uub3JnPohmBBMRAgAmBQJc9DoCAhsDBQkUY8NTBgsJCAcDAgQVAggD
-BBYCAwECHgECF4AACgkQr0z+TTB9e/lQZgCfXIjj30HyCPvUbSbSd6zOS0seAegA
-n3DXayMpRphNmyJgLvl5qKfsX7f6iEYEExECAAYFAkyvJq8ACgkQOzARt2udZSOg
-qQCeOba7kjk7CI+64GOkhhTGSdjnjdQAn2IC5tx+PW38XKwl3Jr5YVp0RyR0
-=AOj6
------END PGP PUBLIC KEY BLOCK-----

coin/provisioning/common/linux/disable-ntp_linux.sh

@@ -39,10 +39,8 @@ echo "Disable Network Time Protocol (NTP)"
 
 if uname -a |grep -q "Ubuntu"; then
     sudo timedatectl set-ntp false
-elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
-    (sudo systemctl stop chronyd && sudo systemctl disable chronyd)
 elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then
     sudo timedatectl set-ntp false
 else
-    sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
+    (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off
 fi

coin/provisioning/common/linux/docker.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## 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.
@@ -33,12 +33,10 @@
 ##
 #############################################################################
 
-set -e
+set -ex
 
 
-PROVISIONING_DIR="$(dirname "$0")/../../"
-. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
+. $(dirname "$0")/../../common/unix/DownloadURL.sh
 
 
 localRepo=http://ci-files01-hki.intra.qt.io/input/docker
@@ -54,24 +52,20 @@ do
     DownloadURL  $localRepo/$f  $upstreamRepo/$f  $sha
 done
 
-sudo apt-get -y install  ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
-rm -f                    ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
+sudo apt-get -y install  ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb
+rm -f                    ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb
 
 sudo usermod -a -G docker $USER
-sudo docker --version
+sudo docker info
 
 # Download and install the docker-compose extension from https://github.com/docker/compose/releases
 f=docker-compose-$(uname -s)-$(uname -m)
 DownloadURL  \
-    $localRepo/$f-1.24.1  \
+    $localRepo/$f  \
     https://github.com/docker/compose/releases/download/1.24.1/$f \
     cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a
 sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
-sudo docker-compose --version
 rm ./docker-compose*
 
-# Install Avahi to discover Docker containers in the test network
-sudo apt-get install avahi-daemon -y
-
 # Start testserver provisioning
-sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh"
+source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh"

coin/provisioning/common/linux/emsdk.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
+version="1.38.16"
+version_node="8.9.1"
+urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
+urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
+urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-llvm-e$version.tar.gz"
+urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
+urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
+urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
+sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d"
+sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673"
+sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
+targetFolder="/opt/emsdk"
+sudo mkdir "$targetFolder"
+
+InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
+InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
+InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
+
+sudo chmod -R a+rwx "$targetFolder"
+
+echo "Writing $targetFolder/.emscripten"
+cat <<EOM >"$targetFolder/.emscripten"
+LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/'
+EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer'
+BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen'
+NODE_JS='$targetFolder/node-v$version_node-linux-x64/bin/node'
+EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
+SPIDERMONKEY_ENGINE = ''
+V8_ENGINE = ''
+TEMP_DIR = '/tmp'
+COMPILER_ENGINE = NODE_JS
+JS_ENGINES = [NODE_JS]
+EOM
+
+SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\""
+SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
+SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
+
+echo "Emsdk = $version" >> ~/versions.txt
+echo "Emsdk node = $version_node" >> ~/versions.txt

coin/provisioning/common/linux/gcc.sh

@@ -88,15 +88,15 @@ function InstallGCC() {
 
     # openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
     if [ -f "/usr/sbin/update-alternatives" ]; then
-        sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" \
-                                           --slave /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" \
-                                           --slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \
-                                           --slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}"
+        sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
+                                           --slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
+                                           --slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
+                                           --slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
     else
-        sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
+        sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
+        sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
+        sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
+        sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
     fi
 
     echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf

coin/provisioning/common/linux/qnx_660.sh

@@ -49,7 +49,7 @@ echo "$sha1  $targetFile" | sha1sum --check
 if [ ! -d "$targetFolder" ]; then
     mkdir -p $targetFolder
 fi
-sudo tar -C $targetFolder -xzf $targetFile
+sudo tar -C $targetFolder -xvzf $targetFile
 sudo chown -R qt:users "$targetFolder"/"$folderName"
 
 # Verify that we have last file in tar

coin/provisioning/common/linux/qnx_700.sh

@@ -41,8 +41,8 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz"
-sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621"
+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 --progress=dot:giga --output-document="$targetFile" "$sourceFile"

coin/provisioning/common/linux/remove_update-manager.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+sudo apt-get remove update-manager

coin/provisioning/common/linux/telegraf-coin.conf

@@ -1,47 +0,0 @@
-[global_tags]
-[agent]
-  interval = "10s"
-  round_interval = true
-  metric_batch_size = 100
-  metric_buffer_limit = 10000
-  collection_jitter = "0s"
-  flush_interval = "10s"
-  flush_jitter = "5s"
-  precision = ""
-  logfile = "/var/log/telegraf-coin.log"
-  hostname = "$COIN_UNIQUE_JOB_ID"
-  omit_hostname = false
-[[outputs.influxdb]]
-  urls= ["https://qtinfluxdb01.intra.qt.io:8086"]
-  insecure_skip_verify = true
-  database = "coin_vms"
-  skip_database_creation = true
-  username = "coin_vms_writer"
-  password = "COIN_VMS_WRITER_PASS"
-[[inputs.cpu]]
-  percpu = true
-  totalcpu = true
-  collect_cpu_time = false
-  report_active = false
-[[inputs.disk]]
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"]
-[[inputs.diskio]]
-[[inputs.kernel]]
-[[inputs.mem]]
-[[inputs.processes]]
-[[inputs.swap]]
-[[inputs.system]]
-[[inputs.kernel_vmstat]]        # linux-only
-[[inputs.netstat]]
-
-
-# Monitor Coin process
-[[inputs.procstat]]
-  exe = "coin-"
-  pid_finder = "native"
-
-
-# Monitor I/O latency
-[[inputs.exec]]
-  data_format = "influx"
-  commands = [ "/usr/bin/telegraf-ioping.sh /" ]

coin/provisioning/common/linux/testserver/apache2/Dockerfile

@@ -0,0 +1,7 @@
+FROM ubuntu:16.04
+ARG packages="apache2 libcgi-session-perl wget avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
+EXPOSE 80 443
+
+# install configurations and test data
+RUN wget https://tools.ietf.org/rfc/rfc3252.txt

coin/provisioning/common/linux/testserver/danted/Dockerfile

@@ -0,0 +1,10 @@
+FROM ubuntu:16.04
+ARG packages="gdebi-core wget avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
+RUN wget http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb
+RUN gdebi -n dante-server_1.4.1-1_amd64.deb
+EXPOSE 1080-1081
+
+# install configurations and test data
+COPY danted /etc/init.d/
+COPY danted-authenticating /etc/init.d/

coin/provisioning/common/linux/testserver/docker_testserver.sh

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+# Using SHA-1 of each server context as the tag of docker images. A tag labels a
+# specific image version. It is used by docker compose file (docker-compose.yml)
+# to launch the corresponding docker containers. If one of the server contexts
+# (./apache2, ./danted, ...) gets changes, all the related compose files in
+# qtbase should be updated as well.
+#
+# For example, here's how to get the SHA-1 of apache test server.
+# find ./apache2 -type f -print0 | sort -z | xargs -r0 sha1sum | \
+# awk '{ print $1 }' | sha1sum | awk '{ print $1 }'
+
+testserver='apache2 squid vsftpd ftp-proxy danted'
+
+for server in $testserver
+do
+    context="${BASH_SOURCE%/*}/$server"
+    sha1=$(find $context -type f -print0 | sort -z | xargs -r0 sha1sum | awk '{ print $1 }' | \
+           sha1sum | awk '{ print $1 }')
+    sudo docker build -t qt-test-server-$server:$sha1 $context
+
+    # transition - The fixed tag is temporarily used by CI to pass the qtbase testing.
+    case $server in
+        apache2) fixed_tag="cc9ea678b92bdda33acb9fa0159bb4ad0f3cd947" ;;
+        squid) fixed_tag="577d99307eea9a8cccfec944d25be2bce2fe99cc" ;;
+        vsftpd) fixed_tag="18896604c7e90b543e56d80c8a8aabdb65a590d0" ;;
+        ftp-proxy) fixed_tag="2c6c8f1ab6a364b540c43d705fb6f15a585cb2af" ;;
+        danted) fixed_tag="327dd56c3c35db85b26fac93213a5a1918475bc7" ;;
+    esac
+    [ -z "$fixed_tag" ] || \
+        sudo docker tag qt-test-server-$server:$sha1 qt-test-server-$server:$fixed_tag
+done
+
+sudo docker images

coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile

@@ -1,4 +1,4 @@
-FROM qt_ubuntu_16.04
-ARG packages="avahi-daemon ftp-proxy"
+FROM ubuntu:16.04
+ARG packages="ftp-proxy avahi-daemon"
 RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
 EXPOSE 2121

coin/provisioning/common/linux/testserver/squid/Dockerfile

@@ -1,4 +1,4 @@
-FROM qt_ubuntu_16.04
-ARG packages="avahi-daemon squid"
+FROM ubuntu:16.04
+ARG packages="squid avahi-daemon"
 RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
 EXPOSE 3128-3130

coin/provisioning/common/linux/testserver/vsftpd/Dockerfile

@@ -1,7 +1,7 @@
-FROM qt_ubuntu_16.04
-ARG packages="avahi-daemon vsftpd ftp"
+FROM ubuntu:16.04
+ARG packages="vsftpd ftp wget avahi-daemon"
 RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
 EXPOSE 20-21
 
 # install configurations and test data
-COPY rfc3252.txt .
+RUN wget https://tools.ietf.org/rfc/rfc3252.txt

coin/provisioning/common/linux/version.sh

@@ -41,9 +41,3 @@ echo "*********************************************"
 echo "***** SW VERSIONS *****"
 cat ~/versions.txt
 echo "*********************************************"
-echo "*************** mount ***********************"
-mount
-echo "*********************************************"
-echo "*************** df **************************"
-df -hT
-echo "*********************************************"

coin/provisioning/common/macos/InstallPKGFromURL.sh

@@ -42,9 +42,7 @@ function InstallPKGFromURL {
     targetDirectory=$4
 
     echo "Creating temporary file"
-    package_basename=$(echo "$url" | sed 's|^.*/||')
-    tmpdir=$(mktemp -d)
-    targetFile="$tmpdir/$package_basename"
+    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"
@@ -52,12 +50,10 @@ function InstallPKGFromURL {
         curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
     )
     echo "Checking SHA1 on PKG '$targetFile'"
-    echo "$expectedSha1 *$targetFile" > "$targetFile".sha1
-    /usr/bin/shasum --check "$targetFile".sha1
+    echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
+    /usr/bin/shasum --check "$targetFile.sha1"
     echo "Run installer on PKG"
     sudo installer -package "$targetFile" -target "$targetDirectory"
-
-    rm -f  "$targetFile".sha1
-    rm -f  "$targetFile"
-    rmdir  "$tmpdir"
+    echo "Removing file '$targetFile'"
+    rm "$targetFile"
 }

coin/provisioning/common/macos/increase_limits.sh

@@ -1,70 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-
-# Increase the soft and hard RLIMIT_NOFILE and RLIMIT_NPROC limits.
-# By default they are 256/unlimited and 709/1064
-# and they sometimes create problems to the build process and telegraf.
-
-
-set -e
-
-PROVISIONING_DIR="$(dirname "$0")/../../"
-. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-
-
-echo "Current limits are:"
-ulimit -a
-launchctl limit
-
-$CMD_INSTALL -m 644 -o root -g wheel  \
-    $PROVISIONING_DIR/common/macos/limit.maxfiles.plist  \
-    $PROVISIONING_DIR/common/macos/limit.maxproc.plist   \
-    /Library/LaunchDaemons/
-
-# Activate the new limits immediately (not for the current session though)
-sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
-sudo launchctl load -w /Library/LaunchDaemons/limit.maxproc.plist
-
-echo "After adjusting, limits are:"
-ulimit -a
-launchctl limit
-
-
-# NOTE: If the limits are not increased enough, it might be because of
-# restrictions set by the kernel. They can be temporarily altered with:
-
-# sudo sysctl -w kern.maxproc=xxxx
-# sudo sysctl -w kern.maxprocperuid=xxx

coin/provisioning/common/macos/libiodbc.sh

@@ -40,6 +40,7 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
+brew update
 brew install ${BASH_SOURCE%/*}/libiodbc.rb
 
 # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc

coin/provisioning/common/macos/limit.maxfiles.plist

@@ -1,20 +0,0 @@
-<?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>limit.maxfiles</string>
-    <key>ProgramArguments</key>
-      <array>
-        <string>launchctl</string>
-        <string>limit</string>
-        <string>maxfiles</string>
-        <string>65536</string>
-        <string>524288</string>
-      </array>
-    <key>RunAtLoad</key>
-      <true/>
-    <key>ServiceIPC</key>
-      <false/>
-  </dict>
-</plist>

coin/provisioning/common/macos/limit.maxproc.plist

@@ -1,20 +0,0 @@
-<?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>limit.maxproc</string>
-    <key>ProgramArguments</key>
-      <array>
-        <string>launchctl</string>
-        <string>limit</string>
-        <string>maxproc</string>
-        <string>8192</string>
-        <string>32768</string>
-      </array>
-    <key>RunAtLoad</key>
-      <true/>
-    <key>ServiceIPC</key>
-      <false/>
-  </dict>
-</plist>

coin/provisioning/common/macos/python2.sh

@@ -42,9 +42,9 @@ 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.16-macosx10.6.pkg"
-AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg"
-SHA1="895a8327a58e7c0e58852638ab3d84843643535b"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg"
+AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg"
+SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09"
 DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
@@ -55,5 +55,5 @@ InstallPip python2.7
 
 SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
 
-echo "python2 = 2.7.16" >> ~/versions.txt
+echo "python2 = 2.7.14" >> ~/versions.txt
 

coin/provisioning/common/macos/telegraf-coin.conf

@@ -1,57 +0,0 @@
-[global_tags]
-[agent]
-  interval = "10s"
-  round_interval = true
-  metric_batch_size = 100
-  metric_buffer_limit = 10000
-  collection_jitter = "0s"
-  flush_interval = "10s"
-  flush_jitter = "5s"
-  precision = ""
-  logfile = "/var/log/telegraf-coin.log"
-  hostname = "$COIN_UNIQUE_JOB_ID"
-  omit_hostname = false
-[[outputs.influxdb]]
-  urls= ["https://qtinfluxdb01.intra.qt.io:8086"]
-  insecure_skip_verify = true
-  database = "coin_vms"
-  skip_database_creation = true
-  username = "coin_vms_writer"
-  password = "COIN_VMS_WRITER_PASS"
-#[[inputs.cpu]]    # linux-only
-#  percpu = true
-#  totalcpu = true
-#  collect_cpu_time = false
-#  report_active = false
-[[inputs.disk]]
-  # macOS needs two extra filesystem exceptions:
-  # + cd9660:  This is a read-only filesystem, and always 100% full
-  # + msdos:   Sometimes at boot a short-lived unique mount of type "msdos"
-  #            is performed, at the random directory
-  #            /Volumes/firmwaresyncd.XXXXXX.
-  #            The uniqueness of the path bloats the cardinality of InfluxDB.
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs", "cd9660", "msdos"]
-#[[inputs.diskio]]    # linux-only
-[[inputs.kernel]]
-[[inputs.mem]]
-[[inputs.processes]]
-[[inputs.swap]]
-[[inputs.system]]
-#[[inputs.kernel_vmstat]]        # linux-only
-[[inputs.netstat]]
-
-
-# Monitor Coin process
-[[inputs.procstat]]
-  exe = "coin-"
-  # Buggy on macOS if using the "native" pid_finder, see:
-  #    https://github.com/influxdata/telegraf/issues/6265
-  # Tested 1.12.1 version that "native" pid_finder has been fixed,
-  # but it is slow and times out frequently
-  pid_finder = "pgrep"
-
-
-# Monitor I/O latency
-[[inputs.exec]]
-  data_format = "influx"
-  commands = [ "/usr/bin/telegraf-ioping.sh /" ]

coin/provisioning/common/macos/version.sh

@@ -41,9 +41,3 @@ echo "*********************************************"
 echo "***** SW VERSIONS *****"
 cat ~/versions.txt
 echo "*********************************************"
-echo "*************** mount ***********************"
-mount
-echo "*********************************************"
-echo "*************** df **************************"
-df -h
-echo "*********************************************"

coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub

@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQINBFYJmwQBEADCw7mob8Vzk+DmkYyiv0dTU/xgoSlp4SQwrTzat8MB8jxmx60l
-QjmhqEyuB8ho4zzZF9KV+gJWrG6Rj4t69JMTJWM7jFz+0B1PC7kJfNM+VcBmkTnj
-fP+KJjqz50ETnsF0kQTG++UJeRYjG1dDK0JQNQJAM6NQpIWJI339lcDf15vzrMnb
-OgIlNxV6j1ZZqkle4fvScF1NQxYScRiL+sRgVx92SI4SyD/xZnVGD/szB+4OCzah
-+0Q/MnNGV6TtN0RiCDZjIUYiHoeT9iQXEONKf7T62T4zUafO734HyqGvht93MLVU
-GQAeuyx0ikGsULfOsJfBmb3XJS9u+16v7oPFt5WIbeyyNuhUu0ocK/PKt5sPYR4u
-ouPq6Ls3RY3BGCH9DpokcYsdalo51NMrMdnYwdkeq9MEpsEKrKIN5ke7fk4weamJ
-BiLI/bTcfM7Fy5r4ghdI9Ksw/ULXLm4GNabkIOSfT7UjTzcBDOvWfKRBLX4qvsx4
-YzA5kR+nX85u6I7W10aSqBiaLqk6vCj0QmBmCjlSeYqNQqSzH/6OoL6FZ7lP6AiG
-F2NyGveJKjugoXlreLEhOYp20F81PNwlRBCAlMC2Q9mpcFu0dtAriVoG4gVDdYn5
-t+BiGfD2rJlCinYLgYBDpTPcdRT3VKHWqL9fcC4HKmic0mwWg9homx550wARAQAB
-tDFJbmZsdXhEQiBQYWNrYWdpbmcgU2VydmljZSA8c3VwcG9ydEBpbmZsdXhkYi5j
-b20+iQI3BBMBCgAhBQJWCZsEAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJ
-EGhKFM8lguDF9XEQAK9rREnZt6ujh7GXfeNki35bkn39q8GYh0mouShFbFY9o0i3
-UJVChsxokJSRPgFh9GOhOPTupl3rzfdpD+IlWI2Myt6han2HOjZKNZ4RGNrYJ5UR
-uxt4dKMWlMbpkzL56bhHlx97RoXKv2d2zRQfw9nyZb6t3lw2k2kKXsMxjGa0agM+
-2SropwYOXdtkz8UWaGd3LYxwEvW3AuhI8EEEHdLetQaYe9sANDvUEofgFbdsuICH
-9QLmbYavk7wyGTPBKfPBbeyTxwW2rMUnFCNccMKLm1i5NpZYineBtQbX2cfx9Xsk
-1JLOzEBmNal53H2ob0kjev6ufzOD3s8hLu4KMCivbIz4YT3fZyeExn0/0lUtsQ56
-5fCxE983+ygDzKsCnfdXqm3GgjaI90OkNr1y4gWbcd5hicVDv5fD3TD9f0GbpDVw
-yDz8YmvNzxMILt5Glisr6aH7gLG/u8jxy0D8YcBiyv5kfY4vMI2yXHpGg1cn/sVu
-ZB01sU09VVIM2BznnimyAayI430wquxkZCyMx//BqFM1qetIgk1wDZTlFd0n6qtA
-fDmXAC4s5pM5rfM5V57WmPaIqnRIaESJ35tFUFlCHfkfl/N/ribGVDg1z2KDW08r
-96oEiIIiV4GfXl+NprJqpNS3Cn+aCXtd7/TsDScDEgs4sMaR29Lsf26cuWk8uQIN
-BFYJmwQBEADDPi3fmwn6iwkiDcH2E2V31cHlBw9OdJfxKVUdyAQEhTtqmG9P8XFZ
-ERRQF155XLQPLvRlUlq7vEYSROn5J6BAnsjdjsH9LmFMOEV8CIRCRIDePG/Mez2d
-nIK5yiU6GkS3IFaQg2T9/tOBKxm0ZJPfqTXbT4jFSfvYJ3oUqc+AyYxtb8gj1GRk
-X283/86/bA3C98u7re1vPtiDRyM8r0+lhEc59Yx/EAOL+X2gZyTgyUoH+LLuOWQK
-s1egI8y80R8NZfM1nMiQk2ywMsTFwQjSVimScvzqv5Nt8k8CvHUQ3a6R+6doXGNX
-5RnUqn9Qvmh0JY5sNgFsoaGbuk2PJrVaGBRnfnjaDqAlZpDhwkWhcCcguNhRbRHp
-N7/a0pQr70bAG9VikzLyGC17EU0sxney/hyNHkr4Uyy2OXHpuJvRjVKy/BwZ3fxA
-AYX2oZIOxQB3/OulzO/DppaCVhRtp1bt+Z5f+fpisiVb5DvZcMdeyAoQ4+oOr7v3
-EasIs2XYcQ+kOE3Y2kdlHWBeuXzxgWgJZ1OOpwGMjR3Uy6IwhuSWtreJBA4er+Df
-vgSPwKBsRLNLbPe3ftjArnC5GfMiGgikVdAUdN4OkEqvUbkRoAVGKTOMLUKm+ZkG
-OskJOVYS+JAina0qkYEFF7haycMjf9olhqLmTIC+6X7Ox9R2plaOhQARAQABiQIf
-BBgBCgAJBQJWCZsEAhsMAAoJEGhKFM8lguDF8ZIP/1q9Sdz8oMvf9AJXZ7AYxm77
-V+kJzJqi62nZLWJnrFXDZJpU+LkYlb3fstsZ1rvBhnrEPSmFxoj72CP0RtcyX7wJ
-dA7K1Fl9LpJi5H8300cC7UyG94MUYbrXijbLTbnFTfNr1tGx4a1T/7Yyxx/wZGrT
-H/X8cvNybkl33SxDdlQQ9kx3lFOwC41e3TkGsUWxn3TCfvDh8VdA6Py6JeSPFGOb
-MEO2/q7oUgvjfV+ivN5ayZi9bWgeqm1sgtmTHHQ4RqwwKrAb5ynXpn1b9QrkevgT
-b91uzMA22Prl4DuzKiaMYDcZOQ3vtf0eFBP0GOSSgUKS4bQ3dGgi1JmQ7VuAM4uj
-+Ug5TnGoLwclTwLksc7v89C5MMPgm2vVXvCUDzyzQA7bIHFeX+Rziby4nymec4Nr
-eeXYNBJWrEp8XR7UNWmEgroXRoN1x9/6esh5pnoUXGAIWuKzSLQM70/wWxS67+v2
-aC1GNb+pXXAzYeIIiyLWaZwCSr8sWMvshFT9REk2+lnb6sAeJswQtfTUWI00mVqZ
-dvI3Wys2h0IyIejuwetTUvGhr9VgpqiLLfGzGlt/y2sg27wdHzSJbMh0VrVAK26/
-BlvEwWDCFT0ZJUMG9Lvre25DD0ycbougLsRYjzmGb/3k3UktS3XTCxyBa/k3TPw3
-vqIHrEqk446nGPDqJPS5
-=9iF7
------END PGP PUBLIC KEY BLOCK-----

coin/provisioning/common/shared/telegraf/telegraf-ioping.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Measure I/O latency once, return data in InfluxDB format
-#
-# Run one ioping command for read, and one for write.
-# Each one sends 3 requests and reports the minimum time, in nanoseconds.
-# (Because of limitations of ioping, we can't just send one request and get
-#  the number back in the batch format. Additionally, the number seems to be
-#  fluctuating quite a bit so taking the smallest number out of 3 requests is
-#  stabilising it a bit.)
-
-
-set -e
-
-[ x"$1" = x ] && echo "$0 takes a path as a first argument" && exit 1
-
-# Try to run in high priority to avoid slow-downs because of
-# factors other than I/O.
-renice  -n -10 -p $$  >/dev/null 2>&1 ||  true
-
-
-rlatency="$(ioping -B -k -c 3 -i 0.1     "$1" | cut -d " " -f 5)"
-wlatency="$(ioping -B -k -c 3 -i 0.1 -W  "$1" | cut -d " " -f 5)"
-
-printf "ioping,path=$1 read_latency_ns=%u,write_latency_ns=%u\n"  \
-       $rlatency  $wlatency

coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt

@@ -1,4 +0,0 @@
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_darwin_amd64.tar.gz         2bc056e1ad38af2ba95d2cb1d43b513cc611fdd3b851b2ff5e09991d52b01253
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_linux_amd64.tar.gz          b33cf0f5935a5c225ab0de69db1e6b249d581f3213313de62a8de928aedadbec
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_windows_amd64.zip           5d025d85070e8c180c443580afa8a27421a7bbcf14b5044894e9f3298d0ce97a
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_windows_i386.zip            5178a0bdaab448c2ef965b0e36f835849cea731ccd87c4a4527f0f05fbbdf271

coin/provisioning/common/shared/testserver/.gitattributes

@@ -1 +0,0 @@
-* text eol=lf

coin/provisioning/common/shared/testserver/apache2/Dockerfile

@@ -1,8 +0,0 @@
-FROM qt_ubuntu_16.04
-ARG packages="avahi-daemon apache2 libcgi-session-perl"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 80 443
-
-# install configurations and test data
-
-COPY rfc3252.txt .

coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon apache2 libcgi-session-perl"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 80 443

coin/provisioning/common/shared/testserver/californium/Dockerfile

@@ -1,13 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon maven default-jdk"
-RUN apt-get update && apt-get -y install $packages
-
-# Get californium-based CoAP test server
-WORKDIR /root/src
-ADD californium-*.tar.gz .
-RUN mv californium-* californium
-WORKDIR /root/src/californium
-RUN mvn clean install -q -DskipTests
-WORKDIR /
-
-EXPOSE 5683/udp 5684/udp

coin/provisioning/common/shared/testserver/cyrus/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_16.04
-ARG packages="avahi-daemon cyrus-imapd"
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages
-EXPOSE 143 993

coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon cyrus-imapd"
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages
-EXPOSE 143 993

coin/provisioning/common/shared/testserver/danted/Dockerfile

@@ -1,11 +0,0 @@
-FROM qt_ubuntu_16.04
-ARG packages="avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-COPY dante-server_1.4.1-1_amd64.deb .
-RUN  apt -y install ./dante-server_1.4.1-1_amd64.deb  \
-  && rm -f          ./dante-server_1.4.1-1_amd64.deb
-EXPOSE 1080-1081
-
-# install configurations and test data
-COPY danted /etc/init.d/
-COPY danted-authenticating /etc/init.d/

coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon dante-server"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 1080-1081

coin/provisioning/common/shared/testserver/docker_images.sh

@@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-set -e
-
-
-PROVISIONING_DIR="$(dirname "$0")/../../../"
-. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
-
-
-# Sort files by their SHA-1, and then return the accumulated result
-sha1tree () {
-    # For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead.
-    [ -x "$(command -v sha1sum)" ] || SHASUM=shasum
-
-    find "$@" -type f -print0 | \
-        xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \
-        sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1
-}
-
-
-SERVER_PATH="$PROVISIONING_DIR/common/shared/testserver"
-
-. "$SERVER_PATH/settings.sh"
-
-
-# Download all necessary dependencies outside of the dockerfiles, so that we
-# can use provisioning functionality for cached and verified downloads. In the
-# dockerfiles we just do COPY to put them where needed.
-
-echo 'Downloading support files for the docker images'
-
-DownloadURL  \
-    http://ci-files01-hki.intra.qt.io/input/docker/rfc3252.txt  \
-    https://tools.ietf.org/rfc/rfc3252.txt  \
-    50c323dedce95e4fdc2db35cd1b8ebf9d74711bf5296ef438b88d186d7dd082d
-cp rfc3252.txt "$SERVER_PATH/vsftpd/"
-cp rfc3252.txt "$SERVER_PATH/apache2/"
-
-DownloadURL  \
-    http://ci-files01-hki.intra.qt.io/input/docker/dante-server_1.4.1-1_amd64.deb  \
-    http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb  \
-    674a06f356cebd92c64920cec38a6687650a6f880198fbbad05aaaccca5c0a21
-mv dante-server_1.4.1-1_amd64.deb "$SERVER_PATH/danted/"
-
-DownloadURL  \
-    http://ci-files01-hki.intra.qt.io/input/docker/FreeCoAP-0.7.tar.gz  \
-    https://github.com/keith-cullen/FreeCoAP/archive/v0.7.tar.gz  \
-    fa6602e27dc8eaee6e34ff53400c0519da0c5c7cd47bf6f13acb564f52a693ee  \
-    FreeCoAP-0.7.tar.gz
-mv FreeCoAP-0.7.tar.gz "$SERVER_PATH/freecoap/"
-
-# Custom fork of Eclipse Californium with changes not upstream
-DownloadURL  \
-    http://ci-files01-hki.intra.qt.io/input/docker/californium-secure-test-server.tar.gz  \
-    https://github.com/sonakur/californium/archive/secure-test-server.tar.gz  \
-    0ee7f5d4366b9e31f6d2d42e389cb7a66d2db54987b700a38a3a31e8f38a7a19  \
-    californium-secure-test-server.tar.gz
-mv californium-secure-test-server.tar.gz "$SERVER_PATH/californium/"
-
-
-echo 'Building the docker images...'
-
-# Build the 2 base layers: qt_ubuntu_1604, qt_ubuntu_1804.
-# These are the base for all other docker images.
-for image in  qt_ubuntu_16.04 qt_ubuntu_18.04
-do
-    docker build -t $image  \
-        --build-arg  COIN_RUNS_IN_QT_COMPANY="$COIN_RUNS_IN_QT_COMPANY"  \
-        "$SERVER_PATH/$image"
-done
-
-
-for server in $testserver
-do
-
-    # We label each docker image with `-t name:tag`.
-    # A tag labels a specific image version. In the docker compose file
-    # (docker-compose.yml) that launches the containers, the tag used is
-    # "latest". Here the images are additionally tagged with the SHA1 of each
-    # image directory (context), so that if needed we can modify
-    # docker-compose.yml and modify "latest" to a SHA in order to launch a
-    # very specific image, thus providing a way to stage
-    # backwards-incompatible changes across repositories.
-
-    context="$SERVER_PATH/$server"
-    tag=$(sha1tree $context)
-    docker build -t qt-test-server-$server:latest  \
-                 -t qt-test-server-$server:$tag    \
-        $context
-done
-
-docker images

coin/provisioning/common/shared/testserver/echo/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_16.04
-ARG packages="avahi-daemon xinetd"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 7 7/UDP 13

coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon xinetd"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 7 7/UDP 13

coin/provisioning/common/shared/testserver/freecoap/Dockerfile

@@ -1,14 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon autoconf automake libtool make libgnutls28-dev"
-RUN apt-get update && apt-get -y install $packages
-
-WORKDIR /root/src
-ADD FreeCoAP-*.tar.gz .
-RUN mv FreeCoAP-* FreeCoAP
-WORKDIR /root/src/FreeCoAP
-RUN autoreconf --install && ./configure && make && make install
-WORKDIR sample/time_server
-RUN make
-WORKDIR /
-
-EXPOSE 5685/udp

coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon ftp-proxy"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 2121

coin/provisioning/common/shared/testserver/iptables/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_16.04
-ARG packages="avahi-daemon iptables"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 1357

coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon iptables"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 1357

coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile

@@ -1,5 +0,0 @@
-FROM ubuntu:16.04
-ARG COIN_RUNS_IN_QT_COMPANY
-RUN  test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue  \
-  && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
-  || echo "Internal package repository not found. Using public repositories."

coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile

@@ -1,5 +0,0 @@
-FROM ubuntu:18.04
-ARG COIN_RUNS_IN_QT_COMPANY
-RUN  test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue  \
-  && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
-  || echo "Internal package repository not found. Using public repositories."

coin/provisioning/common/shared/testserver/settings.sh

@@ -1,38 +0,0 @@
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-set -ex
-
-# A list of test servers to be provisioned
-testserver='apache2 squid vsftpd ftp-proxy danted echo cyrus iptables californium freecoap'
-testserver="$testserver apache2_18.04 squid_18.04 vsftpd_18.04 ftp-proxy_18.04 danted_18.04 echo_18.04 cyrus_18.04 iptables_18.04"

coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon squid"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 3128-3130

coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile

@@ -1,4 +0,0 @@
-FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon vsftpd"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 20-21

coin/provisioning/common/unix/DownloadURL.sh

@@ -39,12 +39,10 @@
 # based on the SHA length). Target filename should also be given.
 
 ############################ BOILERPLATE ###############################
-
-command -v sha1sum   >/dev/null ||  sha1sum   () { shasum -a 1   "$@" ; }
-command -v sha256sum >/dev/null ||  sha256sum () { shasum -a 256 "$@" ; }
-command -v sha384sum >/dev/null ||  sha384sum () { shasum -a 384 "$@" ; }
-command -v sha512sum >/dev/null ||  sha512sum () { shasum -a 512 "$@" ; }
-
+command -v sha1sum >/dev/null   ||  alias   sha1sum='shasum -a 1'
+command -v sha256sum >/dev/null ||  alias sha256sum='shasum -a 256'
+command -v sha384sum >/dev/null ||  alias sha384sum='shasum -a 384'
+command -v sha512sum >/dev/null ||  alias sha512sum='shasum -a 512'
 ########################################################################
 
 
@@ -100,27 +98,20 @@ DownloadURL () {
         targetFile=$4
     fi
 
-    # If a non-empty file already exists
-    if [ -s "$targetFile" ]
+    if VerifyHash "$targetFile" "$expectedHash"
     then
-        if   VerifyHash "$targetFile" "$expectedHash"
+        echo "Skipping download, found and validated existing file:  $targetFile"
+    else
+        echo "Downloading from primary URL:  $url"
+        if  ! Download "$url" "$targetFile"
         then
-            echo "Skipping download, found and validated existing file:  $targetFile"
-            return
-        else
-            echo "WARNING: Non-empty but different file found at destination; will re-download and overwrite file:  $targetFile"
+            echo "FAIL! to download, trying alternative URL:  $url2"  1>&2
+            if  ! Download "$url2" "$targetFile"
+            then
+                echo 'FAIL! to download even from alternative URL'  1>&2
+                return 1
+            fi
         fi
+        VerifyHash "$targetFile" "$expectedHash"
     fi
-
-    echo "Downloading from primary URL:  $url"
-    if  ! Download "$url" "$targetFile"
-    then
-        echo "FAIL! to download, trying alternative URL:  $url2"  1>&2
-        if  ! Download "$url2" "$targetFile"
-        then
-            echo 'FAIL! to download even from alternative URL'  1>&2
-            return 1
-        fi
-    fi
-    VerifyHash "$targetFile" "$expectedHash"
 }

coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh

@@ -67,9 +67,6 @@ function InstallFromCompressedFileFromURL {
         "xz")
             tar -xf "$targetFile" --directory "$targetDirectory"
         ;;
-        "tbz2")
-            tar -xjf "$targetFile" --directory "$targetDirectory"
-        ;;
         *)
             exit 1
         ;;

coin/provisioning/common/unix/common.sourced.sh

@@ -1,167 +0,0 @@
-#!/bin/sh
-
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-
-# Script to be sourced from everywhere you need a common environment. Defines:
-export PROVISIONING_DIR
-export PROVISIONING_OS
-export PROVISIONING_OS_ID
-export PROVISIONING_ARCH
-export CMD_PKG_INSTALL
-export CMD_PKG_LOCALINSTALL
-export CMD_INSTALL
-export COIN_RUNS_IN_QT_COMPANY
-
-
-
-if [ x"$IS_PROVISIONING_COMMON_SOURCED" != x ]
-then
-    echo "common.sourced.sh has already been sourced, re-sourcing skipped"
-    return
-fi
-
-# Do not export; you want children to re-source, because they only inherit the
-# variables but not the functions
-IS_PROVISIONING_COMMON_SOURCED=1
-
-
-fatal () {
-    echo "$1" 1>&2
-    if [ x"$2" != x ]
-    then  exit "$2"
-    else  exit
-    fi
-}
-
-# Takes one argument which should be the filename of this script. Returns true
-# if the script is being sourced, false if the script is being executed.
-is_script_executed () {
-    [ x"$(basename $(echo "$0" | sed s/^-//))" = x"$1" ]
-}
-
-
-is_script_executed  common.sourced.sh  \
-    && fatal "Script common.sourced.sh should always be sourced, not executed"
-
-
-_detect_linux_OS_ID () {
-    if [ -f /etc/os-release ]
-    then
-        . /etc/os-release
-        PROVISIONING_OS_ID="$ID"
-    elif [ -f /etc/redhat-release ]
-    then
-         case "$(cat /etc/redhat-release)" in
-             "Red Hat Enterprise Linux"*)
-                 PROVISIONING_OS_ID="rhel"
-                 ;;
-             "CentOS Linux"*)
-                 PROVISIONING_OS_ID="centos"
-                 ;;
-             *) fatal "Unknown string in /etc/redhat-release" ;;
-         esac
-    fi
-}
-
-set_common_environment () {
-    # Unfortunately we can't find the provisioning directory from a sourced
-    # script in a portable way
-    # PROVISIONING_DIR="$(dirname "$0")/../../"
-
-    [ x"$PROVISIONING_DIR" = x ]  \
-        &&  fatal  "PROVISIONING_DIR variable needs to be set before calling set_common_environment"
-
-    uname_s="$(uname -s)"
-    case "$uname_s" in
-        Linux)
-            PROVISIONING_OS=linux
-            _detect_linux_OS_ID
-            case "$PROVISIONING_OS_ID" in
-                suse|sles|opensuse*)
-                    CMD_PKG_INSTALL="sudo zypper -nq install"
-                    CMD_PKG_LOCALINSTALL="sudo zypper --no-gpg-checks -nq install"
-                    ;;
-                debian|ubuntu)
-                    CMD_PKG_INSTALL="sudo apt -y install"
-                    CMD_PKG_LOCALINSTALL="sudo apt -y install"
-                    ;;
-                rhel|centos|fedora)
-                    CMD_PKG_INSTALL="sudo yum -y install"
-                    CMD_PKG_LOCALINSTALL="sudo yum -y --nogpgcheck localinstall"
-                    ;;
-                *)  fatal "Unknown ID in /etc/os-release: $PROVISIONING_OS_ID" ;;
-            esac
-            ;;
-        Darwin)
-            PROVISIONING_OS=macos
-            PROVISIONING_OS_ID=macos
-            CMD_PKG_INSTALL="brew install"
-            CMD_PKG_LOCALINSTALL="echo 'TODO how to install a package file on macOS'"
-            ;;
-        *)
-            fatal "Unknown system in uname: $uname_s" 42
-            ;;
-    esac
-
-    uname_m="$(uname -m)"
-    case "$uname_m" in
-        x86_64|amd64) PROVISIONING_ARCH=amd64 ;;
-        i[3456]86)    PROVISIONING_ARCH=x86  ;;
-        *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
-    esac
-
-    CMD_INSTALL="sudo install"
-
-    COIN_RUNS_IN_QT_COMPANY=false
-    if  ping -c1 repo-clones.ci.qt.io  >/dev/null 2>&1
-    then
-        COIN_RUNS_IN_QT_COMPANY=true
-    fi
-
-}
-
-set_common_environment
-
-set_dry_run () {
-    if [ x"$PROVISIONING_DRY_RUN" != x ]
-    then
-        CMD_PKG_INSTALL="echo DRYRUN:  $CMD_PKG_INSTALL"
-        CMD_PKG_LOCALINSTALL="echo DRYRUN:  $CMD_PKG_LOCALINSTALL"
-        CMD_INSTALL="echo DRYRUN:  $CMD_INSTALL"
-    fi
-}
-
-set_dry_run

coin/provisioning/common/unix/emsdk.sh

@@ -1,93 +0,0 @@
-#!/usr/bin/env bash
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-# shellcheck source=./InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
-# shellcheck source=./SetEnvVar.sh
-source "${BASH_SOURCE%/*}/SetEnvVar.sh"
-# shellcheck source=./DownloadURL.sh
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
-
-version="1.39.8"
-urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk"
-targetFolder="/opt/emsdk"
-
-# cross-platform emscripten SDK
-urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz"
-urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz"
-sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f"
-
-# platform-specific toolchain and node binaries. urls obtained from "emsdk install"
-if uname -a |grep -q Darwin; then
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
-    urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2"
-    sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d"
-
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz"
-    urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz"
-    sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43"
-    pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node'
-else
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
-    urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2"
-    sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141"
-
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz"
-    urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz"
-    sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa"
-    pathNodeExecutable='node-v12.9.1-linux-x64/bin/node'
-fi
-
-sudo mkdir "$targetFolder"
-
-InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
-InstallFromCompressedFileFromURL "$urlWasmBinariesCache" "$urlWasmBinariesExternal" "$sha1WasmBinaries" "$targetFolder" ""
-InstallFromCompressedFileFromURL "$urlNodeBinariesCache" "$urlNodeBinariesExternal" "$sha1NodeBinaries" "$targetFolder" ""
-
-sudo chmod -R a+rwx "$targetFolder"
-
-echo "Writing $targetFolder/.emscripten"
-cat <<EOM >"$targetFolder/.emscripten"
-EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
-LLVM_ROOT='$targetFolder/install/bin'
-BINARYEN_ROOT='$targetFolder/install'
-NODE_JS='$targetFolder/$pathNodeExecutable'
-TEMP_DIR = '/tmp'
-EOM
-
-SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\""
-SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
-SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
-
-echo "Emsdk = $version" >> ~/versions.txt

coin/provisioning/common/unix/install_protobuff.sh

@@ -64,7 +64,7 @@ if uname -a |grep -q Darwin; then
 else
     ./configure
 fi
-make -j5
+make
 sudo make install
 
 # Refresh shared library cache if OS isn't macOS

coin/provisioning/common/unix/libclang.sh

@@ -65,10 +65,10 @@ zip="/tmp/libclang.7z"
 destination="/usr/local/libclang-$version"
 
 DownloadURL $url_cached $url $sha1 $zip
-sudo 7z x $zip -o/usr/local/
-sudo mv /usr/local/libclang "$destination"
+7z x $zip -o/tmp/
 rm -rf $zip
 
+sudo mv /tmp/libclang "$destination"
 
 echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
 echo "libClang = $version" >> ~/versions.txt

coin/provisioning/common/unix/squishInstall.sh

@@ -38,14 +38,14 @@ set -ex
 # This script will install squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.5"
+version="6.4.3"
 # Branch version without dot
-qtBranch="513x"
+qtBranch="512x"
 squishFolder="/opt/squish"
 squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
-squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run"
+squishFile="squish-$version-qt$qtBranch-linux64.run"
 if uname -a |grep -q Darwin; then
-     squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg"
+     squishFile="squish-$version-qt$qtBranch-macx86_64.dmg"
 fi
 
 squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
@@ -122,7 +122,7 @@ function MountAndInstall {
         sudo cp $targetFileMount /tmp
         UnMount
         sudo hdiutil attach "/tmp/$targetFile"
-        sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null
+        sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
         mountFolder="/Volumes/froglogic Squish"
         UnMount
     elif [[ $targetFile == *.run ]]; then
@@ -130,7 +130,7 @@ function MountAndInstall {
         sudo cp $targetFileMount $targetDirectory
         UnMount
         sudo chmod +x $targetDirectory/$targetFile
-        sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null
+        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

coin/provisioning/common/unix/telegraf_install.sh

@@ -1,98 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-
-# This script installs telegraf and ioping and our script telegraf-ioping.sh
-# to the /usr/bin directory.
-#
-# The reasons we don't install to /usr/local/bin are:
-# 1. On SLES and RHEL, the PATH of sudo (secure_path setting in /etc/sudoers)
-#    does not include /usr/local/bin.
-# 2. On macOS /usr/local/bin does not even exist early in provisioning.
-
-
-######################## BOILERPLATE ###########################
-set -e
-
-
-PROVISIONING_DIR="$(dirname "$0")/../../"
-. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-
-. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
-
-is_script_executed telegraf_install.sh  \
-    || fatal "Script telegraf_install.sh should be executed, not sourced"
-
-################################################################
-
-
-[ "$PROVISIONING_OS" = linux ]  \
-    && ioping_sha256=259abf04bcb84f4126ff97c04b6651e1cf5ea6d8a9ff364c769a26c95b6eeb44  \
-    || ioping_sha256=55de6a2f1a5343e0ce8df31d82d47a9e79c7e612edbc6dfb39b5fc6fb358b2e3
-DownloadURL "http://ci-files01-hki.intra.qt.io/input/ioping/ioping.${PROVISIONING_OS}-${PROVISIONING_ARCH}"  \
-    ''  "$ioping_sha256"  ioping
-$CMD_INSTALL -m 755 ./ioping /usr/bin/
-rm -f ioping
-
-# 2. Install custom ioping monitoring script
-$CMD_INSTALL -m 755  "$PROVISIONING_DIR"/common/shared/telegraf/telegraf-ioping.sh  /usr/bin/
-
-# 3. Download and install telegraf
-
-[ x"$PROVISIONING_OS"   = xmacos ] && os=darwin || os=linux
-[ x"$PROVISIONING_ARCH" = xx86   ] && arch=i386 || arch=amd64
-package_filename=telegraf-1.12.6_${os}_${arch}.tar.gz
-package_sha256_list="$PROVISIONING_DIR"/common/shared/telegraf/telegraf_packages.sha256.txt
-package_sha256=$(sed -n "s/.*$package_filename *//p" "$package_sha256_list")
-
-DownloadURL  \
-    http://ci-files01-hki.intra.qt.io/input/telegraf/"$package_filename"  \
-    https://dl.influxdata.com/telegraf/releases/"$package_filename"  \
-    "$package_sha256"  \
-    telegraf.tar.gz
-
-tar -xzf ./telegraf.tar.gz -C /tmp
-telegraf_binary=$(find /tmp/telegraf* -name telegraf -type f | grep /bin/ | head -1)
-$CMD_INSTALL -m 755  "$telegraf_binary"  /usr/bin/
-rm -rf /tmp/telegraf*
-
-# 4. Edit config file with passwords
-"$PROVISIONING_DIR"/common/unix/telegraf_password.sh
-
-# 5. Start telegraf in background (-b) and with retaining the environment (-E)
-#    in order to report as hostname = $COIN_UNIQUE_JOB_ID.
-/usr/bin/sudo -b -E telegraf --config /etc/telegraf-coin.conf >/dev/null 2>&1
-
-echo DONE: "Installed and started telegraf: $package_filename"

coin/provisioning/common/unix/telegraf_password.sh

@@ -1,60 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-
-######################## BOILERPLATE ###########################
-set -e
-
-
-PROVISIONING_DIR="$(dirname "$0")/../../"
-. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-
-is_script_executed telegraf_password.sh  \
-    || fatal "Script telegraf_password.sh should be executed, not sourced, to avoid leaking secrets in the logs"
-# Avoid leaking secrets in the logs
-set +x
-################################################################
-
-
-# Provisioning should run even without the secrets repository
-influxdb_password=$(cut -d : -f 2  ~qt/work/influxdb/coin_vms_writer.auth)  \
-   || influxdb_password=no_password_provided
-
-rm -f ~qt/work/influxdb/coin_vms_writer.auth
-sed "s|COIN_VMS_WRITER_PASS|$influxdb_password|"  \
-    "$PROVISIONING_DIR"/common/"$PROVISIONING_OS"/telegraf-coin.conf  \
-    > .telegraf-coin.conf.final
-$CMD_INSTALL -m 600 .telegraf-coin.conf.final /etc/telegraf-coin.conf
-rm -f .telegraf-coin.conf.final

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

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## 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.
@@ -51,7 +51,7 @@ $sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4"
 $destination = "C:\Utils\openssl-android-master"
 
 # msys unix style paths
-$ndkPath = "/c/Utils/Android/android-ndk-r20"
+$ndkPath = "/c/Utils/Android/android-ndk-r19c"
 $openssl_path = "/c/Utils/openssl-android-master"
 $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
 Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
@@ -65,25 +65,8 @@ Remove-Item -Path $zip
 Write-Host "Configuring OpenSSL $version for Android..."
 Push-Location $destination
 # $ must be escaped in powershell...
-
-function CheckExitCode {
-
-    param (
-        $p
-    )
-
-    if ($p.ExitCode) {
-        Write-host "Process failed with exit code: $($p.ExitCode)"
-        exit 1
-    }
-}
-
-$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
-CheckExitCode $configure
-
-$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
-CheckExitCode $make
-
+Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
+Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
 Pop-Location
 
 Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"

coin/provisioning/common/windows/android.ps1

@@ -40,10 +40,10 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.
 
 # NDK
-$ndkVersion = "r20"
+$ndkVersion = "r19c"
 $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip"
 $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip"
-$ndkChecksum = "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df"
+$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3"
 $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
 
@@ -95,12 +95,9 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8
 # Get a PATH where Java's path is defined from previous provisioning
 [Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process")
 
-# Attempt to catch all errors of sdkmanager.bat, even when hidden behind a pipeline.
-$ErrorActionPreference = "Stop"
-
 cd $toolsFolder\bin\
 $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
-$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args | Out-Null'
+$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args'
 Invoke-Expression $command
 $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
 iex $command

coin/provisioning/common/windows/conan.ps1

@@ -77,20 +77,27 @@ function Run-Conan-Install
     $manifestsDir = "$PSScriptRoot\conan_manifests"
     $buildinfoRoot = "C:\Utils\conanbuildinfos"
 
-    # Make up to 5 attempts for all download operations in conan
-    $env:CONAN_RETRY = "5"
-
     Get-ChildItem -Path "$ConanfilesDir\*.txt" |
     ForEach-Object {
         $conanfile = $_.FullName
         $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)"
         New-Item $outpwd -Type directory -Force | Out-Null
 
-        Push-Location $outpwd
-        Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", `
-            '-s', ('compiler="' + $Compiler + '"'), `
-            "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile"
-        Pop-Location
+        for ($i = 1; $i -le 5; $i++) {
+            try {
+                Push-Location $outpwd
+                Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", `
+                    '-s', ('compiler="' + $Compiler + '"'), `
+                    "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile"
+                break;
+            } catch {
+                if ($i -eq 5) {
+                    throw "Could not install conan content"
+                }
+            } finally {
+                Pop-Location
+            }
+        }
 
         Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
     }

coin/provisioning/common/windows/disable-defragment.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## 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.
@@ -31,42 +31,4 @@
 ##
 #############################################################################
 
-# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
-# thus needing its own version.
-Write-Host "Disabling defragmentation"
-$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption
-if ($version -like '*Windows 7*'){
-    $pi = New-Object System.Diagnostics.ProcessStartInfo
-    $pi.FileName = "C:\Windows\System32\schtasks.exe"
-    $pi.RedirectStandardError = $true
-    $pi.UseShellExecute  = $false
-    $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F"
-    $prog = New-Object System.Diagnostics.Process
-    $prog.StartInfo = $pi
-    $prog.Start() | Out-Null
-    $err = $prog.StandardError.ReadToEnd()
-    $prog.WaitForExit()
-    if ($prog.ExitCode -eq 0){
-        Write-Host "Scheduled defragmentation removed"
-    } else {
-        if ($err -like '*cannot find the file*'){
-            Write-Host "No scheduled defragmentation task found"
-            exit 0
-        } else {
-            Write-Host "Error while deleting scheduled defragmentation task: $err"
-        }
-    }
-}
-else {
-    try {
-        $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State
-        Write-Host "Scheduled defragmentation task found in state: $state"
-    }
-    catch {
-        Write-Host "No scheduled defragmentation task found"
-        exit 0
-    }
-    Write-Host "Unregistering scheduled defragmentation task"
-    Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag
-    Write-Host "Scheduled Defragmentation task was cancelled"
-}
+schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F

coin/provisioning/common/windows/disable-schedule-tasks.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will remove unneeded Tasks from Task Scheduler
 
@@ -82,7 +82,3 @@ DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskNetwork"
 
 # UNP 'RunUpdateNotificationMgr'
 DeleteSchedulerTask "UNP\RunUpdateNotificationMgr"
-
-
-
-

coin/provisioning/common/windows/disable-update-orchestrator.ps1

@@ -6,10 +6,14 @@ $path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name"
 takeown /F $path /A /R
 icacls $path /grant Administrators:F /T
 SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE
-del "$path\Schedule Scan"
-del "$path\Schedule Scan Static Task"
-del "$path\UpdateModelTask"
-del "$path\USO_UxBroker"
+del "$path\Combined Scan Download Install"
+del "$path\Maintenance Install"
+del "$path\Reboot"
+del "$path\Policy Install"
+del "$path\Refresh Settings"
+del "$path\Resume On Boot"
+del "$path\USO_UxBroker_Display"
+del "$path\USO_UxBroker_ReadyToReboot"
 
 # Disable Update orchestrator service
 reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F

coin/provisioning/common/windows/disable-windows-update-assessment.ps1

@@ -0,0 +1,23 @@
+# The Windows as a Service (WaaS) Update Assessment Platform provides information on a device's Windows updates.
+
+$limit = (Get-Date).AddMinutes(20)
+$path = "C:\Windows\System32\WaaSAssessment.dll"
+
+DO {
+    takeown /F $path
+    icacls  $path /grant Administrators:f
+    Write-host "Deleting $path"
+
+    Try {
+        del $path
+    }
+    Catch [System.UnauthorizedAccessException] {
+        Write-host "Access to the path '$path' is denied."
+        Continue
+    }
+
+    if ((Get-Date) -gt $limit) {
+        exit 1
+    }
+
+}while (Test-Path -Path "$path")

coin/provisioning/common/windows/disable-windows-updates.ps1

@@ -33,8 +33,6 @@
 
 # This script disables the automatic Windows updates
 
-. "$PSScriptRoot\helpers.ps1"
-
 $service = get-service wuauserv
 if (-not $service) {
     Write-Host "Windows Update service not found."
@@ -45,7 +43,7 @@ if ($service.Status -eq "Stopped") {
     Write-Host "Windows Update service already stopped."
 } else {
     Write-Host "Stopping Windows Update service."
-    Retry {Stop-Service -Name "wuauserv" -Force} 20 5
+    Stop-Service -Name "wuauserv" -Force
 }
 
 $startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"

coin/provisioning/common/windows/emsdk.ps1

@@ -1,124 +0,0 @@
-############################################################################
-##
-## 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 emscripten needed by WebAssembly
-
-$version = "1.39.8"
-$versionNode = "12.9.1"
-$versionWinPython = "3.7.4"
-$versionJre = "8_update_152"
-
-$urlEmscripten = "https://storage.googleapis.com/webassembly/emscripten-releases-builds"
-
-# cross-platform emscripten SDK
-$urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.zip"
-$urlCache = "http://ci-files01-hki.intra.qt.io/input/emsdk"
-
-$urlEmscriptenCache="$urlCache/emscripten.$version.zip"
-
-$urlWasmBinariesExternal="$urlEmscripten/win/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.zip"
-$urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip"
-$sha1WasmBinaries="E94DCA7BA0526F88EDDBE45A0A0F61778D173603"
-
-$urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip"
-$urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip"
-$sha1Node = "D064145694578D6617AA99C694772D21480B6B6D"
-
-$urlOfficialWinPython = "$urlEmscripten/deps/python-$versionWinPython-embed-amd64-patched.zip"
-$urlCacheWinPython = "$urlCache/windows/python-$versionWinPython-embed-amd64-patched.zip"
-$sha1WinPython = "27C5A465390167FC03F3DD9075E3FDAAD9FBE104"
-
-$urlOfficialProtableJre = "$urlEmscripten/deps/portable_jre_${versionJre}_64bit.zip"
-$urlCacheProtableJre = "$urlCache/windows/portable_jre_${versionJre}_64bit.zip"
-$sha1ProtableJre = "6830524ec8b16742f956897abb6b6f5ef890a1c2"
-
-$urlOfficialEmscripten = "https://github.com/kripken/emscripten/archive/$version.zip"
-$urlCacheEmscripten = "$urlCache/windows/emscripten-$version.zip"
-$sha1Emscripten = "3721DC133824BA59CDBDFC93704D47CE265F2AFE"
-
-$installLocationEmsdk = "C:\\Utils\\emsdk"
-$temp = "C:\Windows\Temp"
-
-function Install {
-
-    Param (
-        [string] $urlOfficial = $(BadParam("Official url path")),
-        [string] $urlCache = $(BadParam("Cached url path")),
-        [string] $sha1 = $(BadParam("SHA1 checksum of the file")),
-        [string] $location = $(BadParam("Download location")),
-        [string] $installLocation = $(BadParam("Install location"))
-    )
-
-    Download $urlOfficial $urlCache $location
-    Verify-Checksum $location $sha1
-    Extract-7Zip $location $installLocation
-
-}
-
-New-Item -ItemType directory -Force -Path "$installLocationEmsdk"
-
-Install $urlWasmBinariesExternal $urlWasmBinariesCache $sha1WasmBinaries "$temp\wasm-binaries.$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version"
-Install $urlOfficialNode $urlCacheNode $sha1Node "$temp\node-v$versionNode-win-x64.zip" "$installLocationEmsdk"
-Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\python-$versionWinPython-embed-amd64-patched.zip" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched"
-Install $urlOfficialProtableJre $urlCacheProtableJre $sha1ProtableJre "$temp\portable_jre_$versionJre_64bit.zip" "$installLocationEmsdk"
-Install $urlOfficialEmscripten $urlCacheEmscripten $sha1Emscripten "$temp\emscripten-$version.zip" "$installLocationEmsdk"
-
-cd $installLocationEmsdk
-"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -Encoding ASCII
-"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install'" | Out-File '.emscripten' -Append -Encoding ASCII
-"PYTHON='$installLocationEmsdk\\python-$versionWinPython-embed-amd64-patched\\python.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
-"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
-"EMSCRIPTEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\emscripten'" | Out-File '.emscripten' -Append -Encoding ASCII
-"JAVA='$installLocationEmsdk\\Java64'" | Out-File '.emscripten' -Append -Encoding ASCII
-"TEMP_DIR = '/tmp'" | Out-File '.emscripten' -Append -Encoding ASCII
-"COMPILER_ENGINE = NODE_JS" | Out-File '.emscripten' -Append -Encoding ASCII
-"JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ASCII
-
-Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk"
-Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\.emscripten"
-Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\bin"
-Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\"
-Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node$versionNode-win-x64\bin\node.exe"
-Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched\python.exe"
-Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$installLocationEmsdk\java64"
-Set-EnvironmentVariable "EMSCRIPTEN" "$installLocationEmsdk\emscripten-$version"
-Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten"
-Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin"
-
-Write-Output "emsdk = $version" >> ~/versions.txt
-Write-Output "emsdk llvm = $version" >> ~/versions.txt
-Write-Output "emsdk NodeJs = $versionNode" >> ~/versions.txt
-Write-Output "emsdk WinPython 64bit = $versionWinPython" >> ~/versions.txt
-Write-Output "emsdk portable jre = $versionJre" >> ~/versions.txt

coin/provisioning/common/windows/helpers.ps1

@@ -3,7 +3,7 @@ function Verify-Checksum
     Param (
         [string]$File=$(throw("You must specify a filename to get the checksum of.")),
         [string]$Expected=$(throw("Checksum required")),
-        [ValidateSet("sha256","sha1","md5")][string]$Algorithm="sha1"
+        [ValidateSet("sha1","md5")][string]$Algorithm="sha1"
     )
     Write-Host "Verifying checksum of $File"
     $fs = new-object System.IO.FileStream $File, "Open"
@@ -204,38 +204,6 @@ function Get-Proxy {
     return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
 }
 
-function Retry{
-    <#
-    usage:
-    Retry{CODE}
-    Retry{CODE} <num of retries> <delay_s>
-    #delay is in seconds
-    #>
-    Param(
-        [Parameter(mandatory=$true)]
-        [scriptblock]$command,
-        [int][ValidateRange(1, 20)]$retry = 5,
-        [int][ValidateRange(1, 60)]$delay_s = 5
-    )
-    $success=$false
-    $retry_count=0
-    do{
-        try {
-            Invoke-Command -ScriptBlock $command
-            $success=$true
-        }
-        catch {
-            $retry_count++
-            Write-Host "Error: $_, try: $retry_count, retrying in $delay_s seconds"
-            Start-Sleep -Seconds $delay_s
-        }
-    } until ($success -or $retry+1 -le $retry_count)
-
-    if (-not $success) {
-        Throw("Failed to run command successfully in $retry_count tries")
-    }
-}
-
 function Remove {
 
     Param (

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

@@ -44,4 +44,3 @@ Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
 Extract-7Zip "$temp\$zipPackage" C:\Utils
 
 Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt
-Prepend-Path "C:\Utils\gnuwin32\bin"