From d9be0951b439a059e01165102ee3719b845e07d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 3 Jun 2021 13:33:53 +0300 Subject: [PATCH] Replace openSUSE 15.2 with 15.3 Task-number: QTQAINFRA-4477 Change-Id: Ie8ce60c4e6d9b948be2ff813b599a2d8f6d75099 Reviewed-by: Qt CI Bot Reviewed-by: Toni Saario --- coin/platform_configs/cmake_platforms.yaml | 6 +++--- coin/platform_configs/cmake_platforms_wasm.yaml | 4 ++-- .../01-disable_net_lso.sh | 0 .../01-install_telegraf.sh | 0 .../01-systemsetup.sh | 0 .../02-disable-ntp.sh | 0 .../03-enable-repos.sh | 8 ++++---- .../04-zypperpackages.sh | 3 +++ .../08-libclang-v100-dyn.sh | 0 .../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 .../30-install-conan.sh | 0 .../55-emsdk.sh | 0 .../70-install_QemuGA.sh | 0 .../90-squish.sh | 0 .../99-unset-proxy.sh | 0 .../99-version.sh | 0 21 files changed, 12 insertions(+), 9 deletions(-) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/01-disable_net_lso.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/01-install_telegraf.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/01-systemsetup.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/02-disable-ntp.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/03-enable-repos.sh (88%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/04-zypperpackages.sh (97%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/08-libclang-v100-dyn.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/08-libclang.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/08-pythondev.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/09-cmake.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/18-icc.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/20-sccache.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/22-mqtt_broker.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/30-install-conan.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/55-emsdk.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/70-install_QemuGA.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/90-squish.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/99-unset-proxy.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.2-x86_64 => qtci-linux-openSUSE-15.3-x86_64}/99-version.sh (100%) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index ba4341f7..bdfdbe53 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -47,15 +47,15 @@ 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'] - - Id: 'OpenSUSE-15.2-host' - Template: 'qtci-linux-openSUSE-15.2-x86_64-50' + Id: 'OpenSUSE-15.3-host' + Template: 'qtci-linux-openSUSE-15.3-x86_64-50' Compiler: 'GCC' Features: ['Sccache'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' 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.2-x86_64-50' + Template: 'qtci-linux-openSUSE-15.3-x86_64-50' Compiler: 'GCC' Features: ['Sccache'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 4f17122e..147fb301 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -1,10 +1,10 @@ Version: 2 Configurations: - - Template: 'qtci-linux-openSUSE-15.2-x86_64-50' + Template: 'qtci-linux-openSUSE-15.3-x86_64-50' Target os: 'WebAssembly' Compiler: 'GCC' - Platform dependency: 'OpenSUSE-15.2-host' + Platform dependency: 'OpenSUSE-15.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-disable_net_lso.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-disable_net_lso.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-disable_net_lso.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-disable_net_lso.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-install_telegraf.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-systemsetup.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/02-disable-ntp.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-disable-ntp.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/03-enable-repos.sh similarity index 88% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/03-enable-repos.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/03-enable-repos.sh index e89bee10..da5e95b2 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/03-enable-repos.sh @@ -35,9 +35,9 @@ set -ex -sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.2/repo/oss/#g" /etc/zypp/repos.d/repo-oss.repo -sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.2/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo -sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.2/oss/#g" /etc/zypp/repos.d/repo-update.repo -sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.2/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo +sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.3/repo/oss/#g" /etc/zypp/repos.d/repo-oss.repo +sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.3/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo +sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.3/oss/#g" /etc/zypp/repos.d/repo-update.repo +sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.3/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo sudo zypper lr -u diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh similarity index 97% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/04-zypperpackages.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh index 178ca4cc..0687d63c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh @@ -51,6 +51,9 @@ sudo zypper -nq install cups-devel #speech-dispatcher sudo zypper -nq install libspeechd-devel +# make +sudo zypper -nq install make + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-libclang-v100-dyn.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-libclang-v100-dyn.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-pythondev.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-pythondev.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/09-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/09-cmake.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/18-icc.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/18-icc.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/20-sccache.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/20-sccache.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/20-sccache.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/22-mqtt_broker.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-conan.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-conan.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/55-emsdk.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/55-emsdk.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/55-emsdk.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/70-install_QemuGA.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/70-install_QemuGA.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/70-install_QemuGA.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-squish.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/90-squish.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-unset-proxy.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-unset-proxy.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-version.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-version.sh rename to coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-version.sh