From 049eb21a1d6af9c95b1a2b7a33a134dc6abc5433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 25 Feb 2019 15:38:50 +0200 Subject: [PATCH] Replace RHEL 7.4 with 7.6 in the CI Task-number: QTQAINFRA-2942 Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 10 +++++----- coin/platform_configs/qt3d-runtime.txt | 6 +++--- coin/platform_configs/qt5.txt | 6 +++--- .../01-disable-mlocate.sh | 0 .../01-refresh-subscription-manager.sh | 0 .../01-systemsetup.sh | 0 .../02-enable-repos.sh | 0 .../03-install-devtoolset.sh | 0 .../03-install-rhel-epel.sh | 0 .../04-install-packages.sh | 0 .../04-p7zip.sh | 0 .../05-libclang.sh | 0 .../06-cmake.sh | 0 .../07-qnx_700.sh | 0 .../08-integrity.sh | 0 .../09-disable_selinux.sh | 0 .../10-openssl_for_android_linux.sh | 0 .../22-mqtt_broker.sh | 0 .../30-fbx.sh | 0 .../30-install_icu.sh | 0 .../35-install-breakpad.sh | 0 .../40-android_linux.sh | 0 .../60-install_protobuff.sh | 0 .../90-squish.sh | 0 .../99-version.sh | 0 25 files changed, 11 insertions(+), 11 deletions(-) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/01-disable-mlocate.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/01-refresh-subscription-manager.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/01-systemsetup.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/02-enable-repos.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/03-install-devtoolset.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/03-install-rhel-epel.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/04-install-packages.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/04-p7zip.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/05-libclang.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/06-cmake.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/07-qnx_700.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/08-integrity.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/09-disable_selinux.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/10-openssl_for_android_linux.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/22-mqtt_broker.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/30-fbx.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/30-install_icu.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/35-install-breakpad.sh (100%) mode change 100644 => 100755 rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/40-android_linux.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/60-install_protobuff.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/90-squish.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.4-x86_64 => qtci-linux-RHEL-7.6-x86_64}/99-version.sh (100%) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 29a20a07..177d9aa6 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,17 +12,17 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo +qtci-linux-RHEL-7.6-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 1001d869..314099ab 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -6,7 +6,7 @@ qtci-windows-7-x86-3 Mingw73 qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 @@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 1001d869..314099ab 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -6,7 +6,7 @@ qtci-windows-7-x86-3 Mingw73 qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 @@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/10-openssl_for_android_linux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/10-openssl_for_android_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh old mode 100644 new mode 100755 similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh