aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2017-01-27 09:46:48 +0200
committerTony Sarajärvi <tony.sarajarvi@qt.io>2017-04-10 05:20:10 +0000
commitbb5139dd0999c4679dc069cfe6cc0412c3a21598 (patch)
treeef6da057dc19c7bd338bea4baf3d1b94b6c620d3
parentb80fa7bc4cbb74c5ab01186a1cb0392cc7569128 (diff)
Enable autotests for Ubuntu 16.04 and swap configs
As autotests pass, we can also move all existing Ubuntu 14.04 configurations to run on a more recent Ubuntu 16.04. Task-number: QTQAINFRA-1101 Change-Id: I99c4f674dc48521c66ac579c6bb1b5396c282131 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r--coin/platform_configs/default.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index bbee4866..71cfe22b 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -9,10 +9,8 @@ qtci-windows-10-x86-3 MSVC2015
qtci-windows-10-x86_64-3 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-3 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-3 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace DisableTests
-qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
+qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker
@@ -25,4 +23,4 @@ qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang
qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro x86_64 GCC DisableTests
qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck
+qtci-linux-Ubuntu-16.04-x86_64 GCC TestOnly LicenseCheck