aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules92
-rw-r--r--coin/platform_configs/default.yaml9
-rw-r--r--coin/platform_configs/meta-boot2qt.yaml40
-rw-r--r--coin/platform_configs/qt5.yaml30
-rw-r--r--coin/platform_configs/qtwebkit.yaml2
-rwxr-xr-xcoin/provisioning/common/linux/android_linux.sh4
-rwxr-xr-xcoin/provisioning/common/linux/docker.sh7
-rw-r--r--coin/provisioning/common/shared/testserver/.gitattributes1
-rw-r--r--coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/californium/Dockerfile15
-rw-r--r--coin/provisioning/common/shared/testserver/cyrus/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile4
-rwxr-xr-xcoin/provisioning/common/shared/testserver/docker_images.sh (renamed from coin/provisioning/common/linux/docker_testserver.sh)26
-rwxr-xr-xcoin/provisioning/common/shared/testserver/docker_machine.sh7
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/shared/testserver/docker_testserver.sh (renamed from coin/provisioning/common/shared/testserver/testserver_util.sh)30
-rw-r--r--coin/provisioning/common/shared/testserver/echo/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/freecoap/Dockerfile20
-rw-r--r--coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/iptables/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/settings.sh5
-rw-r--r--coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile4
-rw-r--r--coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile4
-rw-r--r--coin/provisioning/common/windows/android-openssl.ps12
-rw-r--r--coin/provisioning/common/windows/android.ps14
-rw-r--r--coin/provisioning/common/windows/disable-windows-updates.ps14
-rw-r--r--coin/provisioning/common/windows/helpers.ps132
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/30-android.sh2
m---------qt3d0
m---------qtactiveqt0
m---------qtandroidextras0
m---------qtbase0
m---------qtcharts0
m---------qtconnectivity0
m---------qtdatavis3d0
m---------qtdeclarative0
m---------qtdoc0
m---------qtgamepad0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtlocation0
m---------qtlottie0
m---------qtmacextras0
m---------qtmultimedia0
m---------qtnetworkauth0
m---------qtpurchasing0
m---------qtquick3d0
m---------qtquickcontrols0
m---------qtquickcontrols20
m---------qtquicktimeline0
m---------qtremoteobjects0
m---------qtscript0
m---------qtscxml0
m---------qtsensors0
m---------qtserialbus0
m---------qtserialport0
m---------qtspeech0
m---------qtsvg0
m---------qttools0
m---------qttranslations0
m---------qtvirtualkeyboard0
m---------qtwayland0
m---------qtwebchannel0
m---------qtwebengine0
m---------qtwebglplugin0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
72 files changed, 279 insertions, 97 deletions
diff --git a/.gitmodules b/.gitmodules
index 1aa79a80..f6948954 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.13.1
+ branch = 5.14
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.13.1
+ branch = 5.14
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = 5.13.1
+ branch = 5.14
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.13.1
+ branch = 5.14
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
- branch = 5.13.1
+ branch = 5.14
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.13.1
+ branch = 5.14
status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = 5.13.1
+ branch = 5.14
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
- branch = 5.13.1
+ branch = 5.14
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,99 +123,99 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.13.1
+ branch = 5.14
status = addon
priority = 10
[submodule "qtcanvas3d"]
@@ -229,86 +229,98 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = 5.13.1
+ branch = 5.14
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
- branch = 5.13.1
+ branch = 5.14
status = addon
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
- branch = 5.13.1
+ 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
status = preview
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index c24ef38e..18ea85f3 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -50,11 +50,6 @@
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-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
@@ -118,7 +113,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-r19c -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-r20 -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'
@@ -126,7 +121,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-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -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-r20 -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
diff --git a/coin/platform_configs/meta-boot2qt.yaml b/coin/platform_configs/meta-boot2qt.yaml
new file mode 100644
index 00000000..95cc79c4
--- /dev/null
+++ b/coin/platform_configs/meta-boot2qt.yaml
@@ -0,0 +1,40 @@
+-
+ 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'
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index 87b2c4c1..95ce332c 100644
--- 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 -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++'
+ 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++'
-
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 -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++'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -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: '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'
+ 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'
-
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-r19c -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-r20 -android-ndk-host linux-x86_64 -android-arch x86_64'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'Android_ANY'
@@ -57,7 +57,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-r19c -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-r20 -android-arch armeabi-v7a'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'Android_ANY'
@@ -65,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-r19c -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-r20 -android-arch arm64-v8a'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'Android_ANY'
@@ -73,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-r19c -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-r20 -android-arch x86'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'Android_ANY'
@@ -81,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-r19c -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-r20 -android-arch x86_64'
-
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'Android_ANY'
@@ -89,7 +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-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a'
+ 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'
@@ -97,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-r19c -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-r20 -android-ndk-host darwin-x86_64 -android-arch arm64-v8a'
-
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'Android_ANY'
@@ -105,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-r19c -android-ndk-host darwin-x86_64 -android-arch x86'
+ 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-macos-10.13-x86_64-2'
Target os: 'Android_ANY'
@@ -113,7 +113,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-r19c -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-r20 -android-ndk-host darwin-x86_64 -android-arch x86_64'
-
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'QNX_700'
@@ -157,12 +157,6 @@
Features: ['Packaging', 'DisableTests']
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'
-
- Template: 'qtci-windows-10-x86_64-14'
- Target os: 'WebAssembly'
- Compiler: 'Mingw73'
- 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'
--
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'WebAssembly'
Compiler: 'Clang'
diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml
index 49426405..0a1d5d31 100644
--- 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 -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++'
+ 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++'
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index 5840d4b4..1e151efe 100755
--- 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="r19c"
+ndkVersion="r20"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-28"
toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
-ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834"
+ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh
index 1d9e8419..9be84e38 100755
--- a/coin/provisioning/common/linux/docker.sh
+++ b/coin/provisioning/common/linux/docker.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,14 +42,15 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun
sudo apt-get update
sudo apt-get install docker-ce -y
sudo usermod -a -G docker $USER
-sudo docker info
+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
# Install Avahi to discover Docker containers in the test network
sudo apt-get install avahi-daemon -y
# Start testserver provisioning
-source "${BASH_SOURCE%/*}/docker_testserver.sh"
+sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh"
diff --git a/coin/provisioning/common/shared/testserver/.gitattributes b/coin/provisioning/common/shared/testserver/.gitattributes
new file mode 100644
index 00000000..fcadb2cf
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
diff --git a/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile
new file mode 100644
index 00000000..dff9fe43
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile
@@ -0,0 +1,4 @@
+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
diff --git a/coin/provisioning/common/shared/testserver/californium/Dockerfile b/coin/provisioning/common/shared/testserver/californium/Dockerfile
new file mode 100644
index 00000000..90722510
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/californium/Dockerfile
@@ -0,0 +1,15 @@
+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
diff --git a/coin/provisioning/common/shared/testserver/cyrus/Dockerfile b/coin/provisioning/common/shared/testserver/cyrus/Dockerfile
new file mode 100644
index 00000000..55486175
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/cyrus/Dockerfile
@@ -0,0 +1,4 @@
+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
diff --git a/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile
new file mode 100644
index 00000000..2e525ec6
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile
@@ -0,0 +1,4 @@
+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
diff --git a/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile
new file mode 100644
index 00000000..f48794af
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile
@@ -0,0 +1,4 @@
+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
diff --git a/coin/provisioning/common/linux/docker_testserver.sh b/coin/provisioning/common/shared/testserver/docker_images.sh
index 2d5d9611..e98183d8 100755
--- a/coin/provisioning/common/linux/docker_testserver.sh
+++ b/coin/provisioning/common/shared/testserver/docker_images.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -35,14 +35,21 @@
set -ex
-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" ;;
+[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]}
+case $FILE in
+ */*) SERVER_PATH="${FILE%/*}" ;;
+ *) SERVER_PATH="." ;;
esac
-# testserver shared scripts
-source "$SERVER_PATH/testserver_util.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
+}
# 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)
@@ -55,8 +62,7 @@ source "$SERVER_PATH/settings.sh"
for server in $testserver
do
context="$SERVER_PATH/$server"
- # 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
+ docker build -t qt-test-server-$server:$(sha1tree $context) $context
done
-sudo docker images
+docker images
diff --git a/coin/provisioning/common/shared/testserver/docker_machine.sh b/coin/provisioning/common/shared/testserver/docker_machine.sh
index 601056a4..8d791074 100755
--- a/coin/provisioning/common/shared/testserver/docker_machine.sh
+++ b/coin/provisioning/common/shared/testserver/docker_machine.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -40,8 +40,11 @@ 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 -d virtualbox $TestMachine
+ docker-machine create $@ $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
diff --git a/coin/provisioning/common/shared/testserver/testserver_util.sh b/coin/provisioning/common/shared/testserver/docker_testserver.sh
index c42fb5e0..3a7c87e8 100644..100755
--- a/coin/provisioning/common/shared/testserver/testserver_util.sh
+++ b/coin/provisioning/common/shared/testserver/docker_testserver.sh
@@ -1,6 +1,8 @@
+#!/usr/bin/env bash
+
#############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,9 +35,23 @@
set -ex
-# 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
-}
+[ -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
diff --git a/coin/provisioning/common/shared/testserver/echo/Dockerfile b/coin/provisioning/common/shared/testserver/echo/Dockerfile
new file mode 100644
index 00000000..653ca714
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/echo/Dockerfile
@@ -0,0 +1,4 @@
+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
diff --git a/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile
new file mode 100644
index 00000000..37f488cb
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile
@@ -0,0 +1,4 @@
+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
diff --git a/coin/provisioning/common/shared/testserver/freecoap/Dockerfile b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile
new file mode 100644
index 00000000..2c665bd5
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile
@@ -0,0 +1,20 @@
+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
diff --git a/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile
new file mode 100644
index 00000000..0e7146ba
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:18.04
+ARG packages="ftp-proxy avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
+EXPOSE 2121
diff --git a/coin/provisioning/common/shared/testserver/iptables/Dockerfile b/coin/provisioning/common/shared/testserver/iptables/Dockerfile
new file mode 100644
index 00000000..cbee61d4
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/iptables/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:16.04
+ARG packages="iptables avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
+EXPOSE 1357
diff --git a/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile
new file mode 100644
index 00000000..5865e9c8
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:18.04
+ARG packages="iptables avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
+EXPOSE 1357
diff --git a/coin/provisioning/common/shared/testserver/settings.sh b/coin/provisioning/common/shared/testserver/settings.sh
index 041661f2..27832773 100644
--- a/coin/provisioning/common/shared/testserver/settings.sh
+++ b/coin/provisioning/common/shared/testserver/settings.sh
@@ -1,6 +1,6 @@
#############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -34,4 +34,5 @@
set -ex
# A list of test servers to be provisioned
-testserver='apache2 squid vsftpd ftp-proxy danted'
+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"
diff --git a/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile
new file mode 100644
index 00000000..208feec7
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:18.04
+ARG packages="squid avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
+EXPOSE 3128-3130
diff --git a/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile
new file mode 100644
index 00000000..843472fd
--- /dev/null
+++ b/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:18.04
+ARG packages="vsftpd avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
+EXPOSE 20-21
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1
index 981fa51d..fb5c5aab 100644
--- 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-r19c"
+$ndkPath = "/c/Utils/Android/android-ndk-r20"
$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
diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1
index def09116..537e14a2 100644
--- 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 = "r19c"
+$ndkVersion = "r20"
$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 = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3"
+$ndkChecksum = "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df"
$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
diff --git a/coin/provisioning/common/windows/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1
index 87414f03..15644cfe 100644
--- a/coin/provisioning/common/windows/disable-windows-updates.ps1
+++ b/coin/provisioning/common/windows/disable-windows-updates.ps1
@@ -33,6 +33,8 @@
# This script disables the automatic Windows updates
+. "$PSScriptRoot\helpers.ps1"
+
$service = get-service wuauserv
if (-not $service) {
Write-Host "Windows Update service not found."
@@ -43,7 +45,7 @@ if ($service.Status -eq "Stopped") {
Write-Host "Windows Update service already stopped."
} else {
Write-Host "Stopping Windows Update service."
- Stop-Service -Name "wuauserv" -Force
+ Retry {Stop-Service -Name "wuauserv" -Force} 20 5
}
$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index ba35f6b5..100f14ae 100644
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -204,6 +204,38 @@ 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 (
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
index 544364b0..1886cce3 100755
--- 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="r19c"
+ndkVersion="r20"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
sdkBuildToolsVersion="28.0.3"
# this is compile sdk version
diff --git a/qt3d b/qt3d
-Subproject b9e24eee0f43061730445e5400aa6a579577466
+Subproject 00e12527dbaacf700ff7a22177a96c5628709fa
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 8168e8c7447a9889554a587ba8c78fc7ba716eb
+Subproject 89e2d977323e874b4074aa1b969a4be5141184b
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 9cc4df84fa778aeac0c391064fffc8b018c8f5c
+Subproject 79052c5be918a18ca6d02bbf6118088ba3e333a
diff --git a/qtbase b/qtbase
-Subproject af6ac444c97ed2dc234f93fe457440c9da5482e
+Subproject c28b881c98fadcd3415370fad2525b558f6b03e
diff --git a/qtcharts b/qtcharts
-Subproject 0bebc937ce87bf28d815444e720e17619c916a9
+Subproject ff84fb0fdaf7ed1a0b646705dcf8b0254f862cd
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 37cd27fac015d8d3b823321a2e2f04826ea844b
+Subproject ccc1544f5ff929f466df8c790a4e7595e177a72
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject ddc28d060d2ae05f221d779bdd04e18f282aa09
+Subproject 7bd8bf6cf8cf6b1f00085c27fd03fbe93010c67
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 02b47ec4a5f956b45436e078fbc7505c664d3be
+Subproject a16e802b3d11781a1509e61da43978893989d7a
diff --git a/qtdoc b/qtdoc
-Subproject 54b8ef3dfd6a509007a2c92cade0cedf9975621
+Subproject f6ee83c936dd68f053effbda5157285ae2ecc71
diff --git a/qtgamepad b/qtgamepad
-Subproject 28385f28cbe11d367e78b497625bb8a282cd4bd
+Subproject ea0457b8058191b4bb22477c7b51975a70af0b0
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 52d3083d3ac1154414245187ad5bcc65d69c014
+Subproject cb8c28031c60c708721ef8a875076f12a630e6b
diff --git a/qtimageformats b/qtimageformats
-Subproject efe5998c3d9121e18660f3105b9ae144c3232ff
+Subproject 17b503073d5aeb505c15ef94f5af10d76898b1c
diff --git a/qtlocation b/qtlocation
-Subproject 8a08b56e71ff3d842cbfb6460a18d5ff991689d
+Subproject f613eb3a6031d6d4f3e5ee230fab3056314fa9a
diff --git a/qtlottie b/qtlottie
-Subproject 86c7306ebc0d011a096f0554e0c206fe17bb577
+Subproject 03b666a967fb7501248e9f40a5b187ec3a16c45
diff --git a/qtmacextras b/qtmacextras
-Subproject 0e854fa114aec06c3d77b19d5c2712154cdc2c3
+Subproject af348830a3ae6852a4e7ff612c045e11c094ef5
diff --git a/qtmultimedia b/qtmultimedia
-Subproject a5ddec658526e47e5783a89c1fd1c463d464fbe
+Subproject dd56d0fd8b45566c491ef30624177919eee621b
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject d7931d733e679c00c313ecff89052ed59bf49c3
+Subproject 272ea7f508d8ee30311c08c07c6e0501f17338c
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 6ef05a39b1ac00496ead66c8e143a05078e148e
+Subproject bc6d56861b93bd87958baa3384c3cbd895f1c3f
diff --git a/qtquick3d b/qtquick3d
new file mode 160000
+Subproject a949102dd14d92532644cae8696d04bc8aa5a64
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 8f4eb455f93fa582a041c49595903eed81c5992
+Subproject 6ab10d971d7d98eeaa50203c24d53da35cfe218
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 230d6f6adc580c853cc05f484e5000703f3e42b
+Subproject 5b9631256f5c4500114981061e9f12104f0c5d8
diff --git a/qtquicktimeline b/qtquicktimeline
new file mode 160000
+Subproject 15de8ac5c06a0afcd8676f976254b3aeeebac58
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 085935e7c2e7793ca915e64f2ed9d6ae37570e2
+Subproject e7e372d6e4eedb473986189cc18a0b8ba71ecc5
diff --git a/qtscript b/qtscript
-Subproject fbf37dd7fa79509aec1d202c77331b0c4114488
+Subproject 44a9b1ffbbd6ea127a2e8ce22dd5d87ef7474fa
diff --git a/qtscxml b/qtscxml
-Subproject 14b12a05efa4bd20f29ede7b729bfd5e2703358
+Subproject 8388555ffb1da9cd5e714dfba6545736e6e2b49
diff --git a/qtsensors b/qtsensors
-Subproject 4c65318cd544980524aa600f4b4e3f97e6b46e0
+Subproject f8f2c4a5d0640090fd50656b1b585c0c3a0936b
diff --git a/qtserialbus b/qtserialbus
-Subproject bf3fe5100df93369997aa9bf3f9ca71c3a908cc
+Subproject 45f9593eff1141e7a86cda4f3dd2380c237c9f5
diff --git a/qtserialport b/qtserialport
-Subproject 5faf8cc2ea0f757327c23e086caa6309eebeaec
+Subproject 78bfc0a93077dafb217f854782e14b65a574694
diff --git a/qtspeech b/qtspeech
-Subproject d3d2777fc868761609ef121ba3e88a20eb11df2
+Subproject c1860e04dfcf9eddcf14cbc4e44f441ad75ffc8
diff --git a/qtsvg b/qtsvg
-Subproject fe7d20286e50c5ac08fb153436580d985d7530e
+Subproject 9d274388f620dfafe0bc8fe0855ce0c8e8ae789
diff --git a/qttools b/qttools
-Subproject f4a51baca04fdaa0fc6a1106db9f7dd91b5a3b2
+Subproject b5e21475344d575a7f07f9d6f3dd2a9d82cf4a5
diff --git a/qttranslations b/qttranslations
-Subproject 55b11294296a7bbc3a3bdfe9d2f5b381abf01d9
+Subproject c3f688fbdfaf633d7e6dd198865d4dc6cdef04b
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject d0cd32798fa9c36dc4294ed78596ed2b798d37f
+Subproject e342f1366eff06f3cf01991b377c880b2d24617
diff --git a/qtwayland b/qtwayland
-Subproject 2b1aad5f86fec13bb83043ed1b08f066dd914b3
+Subproject 32f3f85b3ba044d9eb35996eb8df84b9822b2fd
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 81b39fbe9eb4dbfff34ff9c3e6017eea12bf76c
+Subproject 29496e3f08e20398e253e6d32bb95879a1a6897
diff --git a/qtwebengine b/qtwebengine
-Subproject e00041659a938b72e52c575338655264dc97b0b
+Subproject 1bb41f149bf2d3ad63442ae6058a4446344123c
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject 27495743080cbf0ff7fef2f83f82362d147ae51
+Subproject e51341cf20447c42a62281e633513837058f62e
diff --git a/qtwebsockets b/qtwebsockets
-Subproject e406bf83a963cb1efae6a5869fc5a2a62249a6c
+Subproject 187d767f10a4319db2f442dfed080bbcbaccaa2
diff --git a/qtwebview b/qtwebview
-Subproject 13dfe272a387a2f56229df916a580ab9ac92e33
+Subproject fb2a2003fbb41ac91b319afb56f290b415befb6
diff --git a/qtwinextras b/qtwinextras
-Subproject 07f43f05d3ed8e54e4a62b20b958644f58fab7f
+Subproject ee2d2f7a93c5b0866e91293d6233ae2703281ca
diff --git a/qtx11extras b/qtx11extras
-Subproject 839e33dc17d24ec41bb95b76ef6ed208d8f4f49
+Subproject a0443bd723601205c8cc4666dd89be5a32decf9
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 04e770cfbafa16c09dd527897bfac2a457b4764
+Subproject 9da08816e1072fc1391377a38d6afd9e73d756e