aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/default.txt
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2017-08-07 09:56:49 +0300
committerLiang Qi <liang.qi@qt.io>2017-10-19 09:28:44 +0000
commit357202801f5bdff61e69539e0ee7d2deee5c5143 (patch)
treed314d94b36eb2f2b69da2a6be99ffbe861c94b6d /coin/platform_configs/default.txt
parent5c7ccdbc833435890db890ea9c46569dbaecf8cc (diff)
Make CI use a new RHEL 7.4 provisioning
Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This commit replaces RHEL 7.2 in desktop builds, android builds and INTEGRITY builds. Task-number: QTQAINFRA-1251 Task-number: QTQAINFRA-1252 Task-number: QTQAINFRA-1253 Task-number: QTQAINFRA-1267 Task-number: QTQAINFRA-1269 Change-Id: Icef19df7fb799a4008ccdc0584821c982055e339 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/platform_configs/default.txt')
-rw-r--r--coin/platform_configs/default.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index fb4bda82..41e4b407 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -11,12 +11,12 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC
qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-42.3-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
+qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static
-qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck
qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker