From 89e0159bbc0f3837bb777a92bb7d80e58973a1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 14 Jun 2018 13:42:21 +0300 Subject: [PATCH] Swap openSUSE 42.3 to 15 Task-number: QTQAINFRA-2067 Change-Id: I71f79181704d6ce8faac0019f6d7a5016b0ecb5e Reviewed-by: Qt CI Bot Reviewed-by: Gatis Paeglis Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 4 ++-- coin/provisioning/common/linux/disable-ntp_linux.sh | 2 ++ .../01-systemsetup.sh | 4 +++- .../02-disable-ntp.sh | 0 .../02-zypperpackages.sh | 5 ++++- .../08-libclang.sh | 0 .../08-pythondev.sh | 0 .../09-cmake.sh | 0 .../18-icc.sh | 0 .../22-mqtt_broker.sh | 0 .../50-open62541.sh | 0 .../55-emsdk.sh | 0 .../90-squish.sh | 0 .../99-unset-proxy.sh | 0 .../99-version.sh | 0 15 files changed, 11 insertions(+), 4 deletions(-) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/01-systemsetup.sh (93%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/02-disable-ntp.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/02-zypperpackages.sh (92%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/08-libclang.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/08-pythondev.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/09-cmake.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/18-icc.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/22-mqtt_broker.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/50-open62541.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/55-emsdk.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/90-squish.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/99-unset-proxy.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-42.3-x86_64 => qtci-linux-openSUSE-15.0-x86_64}/99-version.sh (100%) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index e4da8523..c88d018b 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -9,8 +9,8 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite +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-RHEL-7.4-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-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index b73e44a5..06d17be0 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -39,6 +39,8 @@ echo "Disable Network Time Protocol (NTP)" if uname -a |grep -q "Ubuntu"; then sudo timedatectl set-ntp false +elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then + (sudo systemctl stop chronyd && sudo systemctl disable chronyd) else (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh similarity index 93% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh index 61c19510..7e6993a5 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh @@ -8,6 +8,9 @@ source "$BASEDIR/../common/shared/network_test_server_ip.txt" # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +# https://bugzilla.opensuse.org/show_bug.cgi?id=1032027 +sudo btrfs quota disable / + sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub @@ -33,4 +36,3 @@ if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy fi - diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh similarity index 92% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh index 0507dc6d..d1f3050f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh @@ -31,7 +31,7 @@ sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-dev xcb-util-wm-devel xcb-util-renderutil-devel # ICU -sudo zypper -nq install libicu-devel libicu52_1 +sudo zypper -nq install libicu-devel libicu60_2 # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel \ @@ -46,3 +46,6 @@ sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-de # cups sudo zypper -nq install cups-devel + +#speech-dispatcher +sudo zypper -nq install libspeechd-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/50-open62541.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/50-open62541.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-version.sh rename to coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh