From e472db17f35a78d9fd983eef90f954185bc8db36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 25 Nov 2020 14:44:56 +0000 Subject: [PATCH] Replace openSUSE 15.1 with openSUSE 15.2 Task-number: QTQAINFRA-4035 Change-Id: I11746ab2d6447dd5d33846bff68f6983670adbbe Reviewed-by: Qt CI Bot Reviewed-by: Ville-Pekka Karhu Reviewed-by: Heikki Halmet --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/default.yaml | 2 +- coin/platform_configs/qtbase.yaml | 2 +- .../01-install_telegraf.sh | 0 .../01-systemsetup.sh | 0 .../02-disable-ntp.sh | 0 .../02-zypperpackages.sh | 2 +- .../08-libclang.sh | 0 .../08-pythondev.sh | 0 .../09-cmake.sh | 0 .../18-icc.sh | 0 .../20-sccache.sh | 0 .../22-mqtt_broker.sh | 0 .../55-emsdk.sh | 0 .../70-install_QemuGA.sh | 0 .../90-squish.sh | 0 .../99-unset-proxy.sh | 0 .../99-version.sh | 0 18 files changed, 4 insertions(+), 4 deletions(-) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/01-install_telegraf.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/01-systemsetup.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/02-disable-ntp.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/02-zypperpackages.sh (97%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/08-libclang.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/08-pythondev.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/09-cmake.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/18-icc.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/20-sccache.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/22-mqtt_broker.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/55-emsdk.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/70-install_QemuGA.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/90-squish.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/99-unset-proxy.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.1-x86_64 => qtci-linux-openSUSE-15.2-x86_64}/99-version.sh (100%) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 7a4a34de..c8da98d3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -37,7 +37,7 @@ Configurations: Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Template: 'qtci-linux-openSUSE-15.1-x86_64' + Template: 'qtci-linux-openSUSE-15.2-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'InsignificantTests'] Configure arguments: '-DBUILD_EXAMPLES=OFF -FEATURE_developer_build=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 593154a8..09120a3a 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -21,7 +21,7 @@ Configurations: Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl' - - Template: 'qtci-linux-openSUSE-15.1-x86_64' + Template: 'qtci-linux-openSUSE-15.2-x86_64-50' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['DisableTests', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index ec84991c..56ac5748 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -2,7 +2,7 @@ Version: 2 Include: [cmake_platforms.yaml] Configurations: - - Template: 'qtci-linux-openSUSE-15.1-x86_64' + Template: 'qtci-linux-openSUSE-15.2-x86_64-50' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['DisableTests', 'UseLegacyInstructions'] diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-disable-ntp.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-zypperpackages.sh similarity index 97% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-zypperpackages.sh index 87afa41a..5c13b017 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-zypperpackages.sh @@ -32,7 +32,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 libicu60_2 +sudo zypper -nq install libicu-devel # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel \ diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-pythondev.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/09-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/18-icc.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/20-sccache.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/20-sccache.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/20-sccache.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/55-emsdk.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/55-emsdk.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/70-install_QemuGA.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/70-install_QemuGA.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/70-install_QemuGA.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/90-squish.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-unset-proxy.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-version.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh rename to coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-version.sh