Remove more of update notifiers

Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 2eab420e80) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change local Ubuntu repo mirror in provisioning
2026-01-06 15:06:52 +08:00 · 2019-11-23 11:01:50 +02:00 · 2019-11-23 11:01:43 +02:00 · 2019-11-23 11:01:36 +02:00 · 2019-11-23 11:01:29 +02:00 · 2019-11-23 11:01:21 +02:00
81 changed files with 193 additions and 368 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.14
+	branch = 5.13.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.14
+	branch = 5.13.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.14
+	branch = 5.13.2
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.14
+	branch = 5.13.2
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.14
+	branch = 5.13.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.14
+	branch = 5.13.2
 	status = deprecated
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.14
+	branch = 5.13.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -62,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.14
+	branch = 5.13.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,99 +123,99 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -229,98 +229,86 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.14
+	branch = 5.13.2
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.14
+	branch = 5.13.2
 	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 5.14
-	status = preview
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 5.14
-	status = preview
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 5.14
+	branch = 5.13.2
 	status = preview
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -47,7 +47,7 @@ Configurations:
    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-r20 -android-arch x86'
+    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-18.04-x86_64'
    Compiler: 'GCC'
@@ -61,6 +61,16 @@ Configurations:
    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.0-x86_64'
@@ -77,6 +87,11 @@ Configurations:
    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'
@@ -129,15 +144,7 @@ Configurations:
    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 -android-arch x86'
-
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
-    Target os: 'Android_ANY'
-    Target arch: 'multi'
-    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.6-x86_64'
    Target os: 'Android_ANY'
@@ -145,7 +152,7 @@ Configurations:
    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-r20 -android-ndk-host linux-x86_64 -android-arch x86'
+    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'
--- a/coin/platform_configs/meta-boot2qt.yaml
+++ b/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'
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -15,12 +15,12 @@
    Template: 'qtci-windows-7-x86-3'
    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++'
+    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-14'
    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++'
+    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-14'
    Target os: 'WinRT_10'
@@ -41,7 +41,7 @@
    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-r20 -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang'
+    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.6-x86_64'
    Target os: 'Android_ANY'
@@ -49,7 +49,7 @@
    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-r20 -android-ndk-host linux-x86_64 -android-arch x86_64'
+    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_64'
 -
    Template: 'qtci-linux-RHEL-7.6-x86_64'
    Target os: 'Android_ANY'
@@ -57,15 +57,7 @@
    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-r20 -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
-
-    Template: 'qtci-windows-10-x86_64-14'
-    Target os: 'Android_ANY'
-    Target arch: 'multi'
-    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-r20'
+    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-14'
    Target os: 'Android_ANY'
@@ -73,7 +65,7 @@
    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-r20 -android-arch armeabi-v7a'
+    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-14'
    Target os: 'Android_ANY'
@@ -81,7 +73,7 @@
    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-r20 -android-arch arm64-v8a'
+    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-windows-10-x86_64-14'
    Target os: 'Android_ANY'
@@ -89,7 +81,7 @@
    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-r20 -android-arch x86_64'
+    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_64'
 -
    Template: 'qtci-macos-10.13-x86_64-2'
    Target os: 'Android_ANY'
@@ -97,15 +89,7 @@
    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 -android-arch armeabi-v7a'
-
-    Template: 'qtci-macos-10.13-x86_64-2'
-    Target os: 'Android_ANY'
-    Target arch: 'multi'
-    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 /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'
@@ -113,7 +97,7 @@
    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 -android-arch arm64-v8a'
+    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: 'Android_ANY'
@@ -121,7 +105,7 @@
    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 -android-arch 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_64'
 -
    Template: 'qtci-macos-10.13-x86_64-2'
    Target os: 'QNX_700'
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -2,4 +2,4 @@
    Template: 'qtci-windows-7-x86-3'
    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++'
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -51,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"
--- a/coin/provisioning/common/linux/docker.sh
+++ b/coin/provisioning/common/linux/docker.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## 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.
@@ -35,22 +35,40 @@

 set -ex

-# Download and install the docker engine.
-sudo apt-get install curl -y
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-sudo apt-get update
-sudo apt-get install docker-ce -y
-sudo usermod -a -G docker $USER
-sudo docker --version

-# Download and install the docker-compose extension.
-sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
-sudo chmod +x /usr/local/bin/docker-compose
-sudo docker-compose --version
+. $(dirname "$0")/../../common/unix/DownloadURL.sh
+
+
+localRepo=http://ci-files01-hki.intra.qt.io/input/docker
+upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64
+
+echo '
+    f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb
+    ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb
+    09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb
+' \
+    | xargs -n2 | while read  sha f
+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 usermod -a -G docker $USER
+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  \
+    https://github.com/docker/compose/releases/download/1.24.1/$f \
+    cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a
+sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
+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%/*}/docker_testserver.sh"
--- a/coin/provisioning/common/shared/testserver/docker_images.sh
+++ b/coin/provisioning/common/shared/testserver/docker_images.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## 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.
@@ -35,21 +35,14 @@

 set -ex

-[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]}
-case $FILE in
-    */*) SERVER_PATH="${FILE%/*}" ;;
-    *) SERVER_PATH="." ;;
+case ${BASH_SOURCE[0]} in
+    */linux/*) SERVER_PATH="${BASH_SOURCE[0]%/linux/*}/shared/testserver" ;;
+    */*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;;
+    *) SERVER_PATH="../shared/testserver" ;;
 esac

-# 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
-}
+# testserver shared scripts
+source "$SERVER_PATH/testserver_util.sh"

 # 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)
@@ -62,7 +55,8 @@ source "$SERVER_PATH/settings.sh"
 for server in $testserver
 do
    context="$SERVER_PATH/$server"
-    docker build -t qt-test-server-$server:$(sha1tree $context) $context
+    # Sort files by their SHA-1 and use the accumulated result as the TAG
+    sudo docker build -t qt-test-server-$server:$(sha1tree $context) $context
 done

-docker images
+sudo docker images
--- a/coin/provisioning/common/linux/remove-update_notifier.sh
+++ b/coin/provisioning/common/linux/remove-update_notifier.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash

-sudo apt -q -y remove update-notifier update-manager
+sudo apt -q -y remove update-notifier update-manager python3-distupgrade python3-update-manager ubuntu-release-upgrader-core update-manager-core
--- a/coin/provisioning/common/macos/install-commandlinetools.sh
+++ b/coin/provisioning/common/macos/install-commandlinetools.sh
@@ -50,7 +50,7 @@ function InstallCommandLineTools {
    hdiutil attach "/tmp/$packageName"
    cd "/Volumes/Command Line Developer Tools"
    echo "Installing"
-    sudo installer -pkg ./*.pkg -target /
+    sudo installer -pkg ./*.pkg -target / -allowUntrusted
    cd /
    # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
    sleep 3
--- a/coin/provisioning/common/shared/testserver/.gitattributes
+++ b/coin/provisioning/common/shared/testserver/.gitattributes
@@ -1 +0,0 @@
-* text eol=lf
--- a/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:18.04
-ARG packages="apache2 libcgi-session-perl avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 80 443
--- a/coin/provisioning/common/shared/testserver/californium/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/californium/Dockerfile
@@ -1,15 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update && apt-get -y install git maven default-jdk avahi-daemon
-
-RUN mkdir -p /root/src/
-
-# Get californium-based CoAP test server
-WORKDIR /root/src
-RUN git clone https://github.com/selart/californium.git
-WORKDIR /root/src/californium
-RUN mvn clean install -q -DskipTests
-
-WORKDIR /
-
-EXPOSE 5683/udp 5684/udp
--- a/coin/provisioning/common/shared/testserver/cyrus/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/cyrus/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:16.04
-ARG packages="cyrus-imapd avahi-daemon"
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages
-EXPOSE 143 993
--- a/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:18.04
-ARG packages="cyrus-imapd avahi-daemon"
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages
-EXPOSE 143 993
--- a/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:18.04
-ARG packages="dante-server avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 1080-1081
--- a/coin/provisioning/common/shared/testserver/docker_machine.sh
+++ b/coin/provisioning/common/shared/testserver/docker_machine.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## 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.
@@ -40,11 +40,8 @@ TestMachine='qt-test-server'
 # Deploy docker virtual machine (Boot2Docker) into VirtualBox only if it doesn't exist
 if [ -z $(docker-machine ls -q --filter "name=$TestMachine") ]
 then
-    docker-machine create $@ $TestMachine
+    docker-machine create -d virtualbox $TestMachine
    docker-machine ip $TestMachine
-else
-    # Otherwise, start the docker machine and update with new TLS certificates.
-    docker-machine start $TestMachine && docker-machine regenerate-certs -f $TestMachine
 fi

 # Switch the docker engine to $TestMachine
--- a/coin/provisioning/common/shared/testserver/echo/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/echo/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:16.04
-ARG packages="xinetd avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 7 7/UDP 13
--- a/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:18.04
-ARG packages="xinetd avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 7 7/UDP 13
--- a/coin/provisioning/common/shared/testserver/freecoap/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile
@@ -1,20 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update && apt-get -y install git avahi-daemon autoconf automake libtool make libgnutls28-dev
-
-RUN mkdir -p /root/src/
-
-# Get FreeCoAP test server
-WORKDIR /root/src
-RUN git clone https://github.com/keith-cullen/FreeCoAP.git
-WORKDIR /root/src/FreeCoAP
-RUN autoreconf --install
-RUN ./configure
-RUN make
-RUN make install
-WORKDIR /root/src/FreeCoAP/sample/time_server
-RUN make
-
-WORKDIR /
-
-EXPOSE 5685/udp
--- a/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:18.04
-ARG packages="ftp-proxy avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 2121
--- a/coin/provisioning/common/shared/testserver/iptables/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/iptables/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:16.04
-ARG packages="iptables avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 1357
--- a/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:18.04
-ARG packages="iptables avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 1357
--- a/coin/provisioning/common/shared/testserver/settings.sh
+++ b/coin/provisioning/common/shared/testserver/settings.sh
@@ -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.
@@ -34,5 +34,4 @@
 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"
+testserver='apache2 squid vsftpd ftp-proxy danted'
--- a/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:18.04
-ARG packages="squid avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 3128-3130
--- a/coin/provisioning/common/shared/testserver/docker_testserver.sh
+++ b/coin/provisioning/common/shared/testserver/docker_testserver.sh
@@ -1,8 +1,6 @@
-#!/usr/bin/env bash
-
 #############################################################################
 ##
-## 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.
@@ -35,23 +33,9 @@

 set -ex

-[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]}
-case $FILE in
-    */*) SERVER_PATH="${FILE%/*}" ;;
-    *) SERVER_PATH="." ;;
-esac
-
-# Create docker virtual machine (Boot2docker)
-case $1 in
-    VMX) source "$SERVER_PATH/docker_machine.sh" "-d virtualbox" ;;
-    Hyper-V)
-        # The Hyper-v has been enabled in Windows 10. Disable checking the hardware virtualization.
-        source "$SERVER_PATH/docker_machine.sh" "-d virtualbox --virtualbox-no-vtx-check" ;;
-    *) ;;
-esac
-
-# Display system-wide information of docker-engine
-docker info
-
-# Create images
-$SERVER_PATH/docker_images.sh
+# Sort files by their SHA-1, and then return the accumulated result
+sha1tree () {
+    find "$@" -type f -print0 | \
+        xargs -0 shasum | cut -d ' ' -f 1 | \
+        sort | shasum | cut -d ' ' -f 1
+}
--- a/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile
@@ -1,4 +0,0 @@
-FROM ubuntu:18.04
-ARG packages="vsftpd avahi-daemon"
-RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
-EXPOSE 20-21
--- a/coin/provisioning/common/unix/DownloadURL.sh
+++ b/coin/provisioning/common/unix/DownloadURL.sh
@@ -89,7 +89,14 @@ DownloadURL () {
    url=$1
    url2=$2
    expectedHash=$3
-    targetFile=$4
+    # Optional argument $4: destination filename
+    if [ x"$4" = x ]
+    then
+        # defaults to the last component of $url
+        targetFile=$(echo $url | sed 's|^.*/||')
+    else
+        targetFile=$4
+    fi

    if VerifyHash "$targetFile" "$expectedHash"
    then
@@ -99,9 +106,9 @@ DownloadURL () {
        if  ! Download "$url" "$targetFile"
        then
            echo "FAIL! to download, trying alternative URL:  $url2"  1>&2
-            if  ! Download "$url" "$targetFile"
+            if  ! Download "$url2" "$targetFile"
            then
-                echo 'FAIL! to download even from alternative url'  1>&2
+                echo 'FAIL! to download even from alternative URL'  1>&2
                return 1
            fi
        fi
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -51,7 +51,7 @@ $sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102"
 $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
--- a/coin/provisioning/common/windows/android.ps1
+++ b/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"

--- a/coin/provisioning/common/windows/disable-windows-updates.ps1
+++ b/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"
--- a/coin/provisioning/common/windows/emsdk.ps1
+++ b/coin/provisioning/common/windows/emsdk.ps1
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -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 (
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -46,12 +46,15 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
 done

 function set_internal_repo {
+
+    # Stop fetching the dep-11 metadata, since our mirrors do not handle them well
+    sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}
+
    sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-updates main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-backports main restricted universe
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-security main restricted universe multiverse
+    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse
+    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse
+    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe
+    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse
 EOC
 }

--- a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"

-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1.tar.gz 10.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1_updated.tar.gz 10.1
--- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
@@ -51,7 +51,7 @@ toolsVersion="r26.1.1"
 # toolsFile dertermines tools version
 toolsFile="sdk-tools-darwin-4333796.zip"

-ndkVersion="r20"
+ndkVersion="r19c"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
 sdkBuildToolsVersion="28.0.3"
 # this is compile sdk version
--- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh
@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"

-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1.tar.gz 10.2.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1
--- a/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Tony Sarajärvi	8d483c2893	Remove more of update notifiers Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `2eab420e80`) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-11-23 11:01:50 +02:00
Tony Sarajärvi	ca0894431f	Change local Ubuntu repo mirror in provisioning The old mirror host Qt company used to sync their local mirror from, stopped syncing from Ubuntu in October 2018. The mirror mechanism was changed so that in the future if addresses change, we don't have to touch the provisioning scripts as the address is more general. Also a duplicate entry was removed. Task-number: QTQAINFRA-3279 Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `5b77e74a5e`) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-11-23 11:01:43 +02:00
Dimitrios Apostolou	ed07695fa8	Workaround broken local apt mirror Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `ef7481b9cd`)	2019-11-23 11:01:36 +02:00
Dimitrios Apostolou	24ba10ebb3	DownloadURL last argument (targetFile) is now optional Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `6cc2215b8c`)	2019-11-23 11:01:29 +02:00
Dimitrios Apostolou	46ae9155f7	Docker installation: do not depend on external repositories Also updated the docker-compose binary to the latest one. Task-number: QTQAINFRA-3279 Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `a270bcdb6b`)	2019-11-23 11:01:21 +02:00
Heikki Halmet	a54d4882c2	Provisioning: Update Xcode package for macOS 10.14 Apple's certification was expired so Xcode 10.2.1 package needs to be updated from the Apple's download server. Old one causing problems with RTA tests. Task-number: QTQAINFRA-3317 Change-Id: I5006f95ab420e26523d2621800d80322a52bb9a2 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `5b752460bc`)	2019-11-23 11:01:13 +02:00
Heikki Halmet	88a0a79721	Add allowUntrusted parameter for command line tools and refresh Xcode Apple has signed their packages with certificate which has been expired 24.11.2019. Packages are unusable without allowUntrusted parameter Also Xcode package for macOS10.13 needs to be refetched from Apple's download to local cache Task-number: QTQAINFRA-3317 Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `eb0ef419ec`)	2019-11-23 11:01:07 +02:00
Dimitrios Apostolou	9f88c3e7c0	Fix for DownloadURL to try alternative URL Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `518e114dc7`) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-11-23 11:00:59 +02:00
Qt Submodule Update Bot	aebccd2885	Update submodules on '5.13.2' in qt5 Change-Id: I28739af9410fcfe4431db88c736b47e3149775ab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-10-28 05:10:40 +00:00
Qt Submodule Update Bot	39b7b63d5b	Update submodules on '5.13.2' in qt5 Change-Id: I6ca4d856a37763191c8c9f1126c5a3814d6bbd37 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-10-16 12:05:43 +00:00
Qt Submodule Update Bot	6d12189f0c	Update submodules on '5.13.2' in qt/qt5 Change-Id: Iba6d73291117085f2175415be7545219442165bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-10-09 23:28:04 +02:00
Edward Welbourne	27ecf13595	Remove execute permissions from scripts not run on Unix This amends `38e416be66`. Change-Id: I8b0f4f72565b30b097cb36092f7cb90d61c1487e Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-10-07 17:21:12 +00:00
Frederik Gladhorn	78cdf36832	Adjust submodule branches Change-Id: Ie21cb35574298ed077e5f8ce071aa94b7d2cd1d4	2019-10-03 21:20:04 +02:00