diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2021-06-03 13:33:53 +0300 |
---|---|---|
committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-06-08 08:39:21 +0300 |
commit | dc7c53aa05361f06491c49b0f0749828c2585c56 (patch) | |
tree | 742620dea56a5430b09439868fb3aaee38a21b80 | |
parent | b842483f93fd418b91ddf24b8f72b1d758b94f75 (diff) |
Replace openSUSE 15.2 with 15.3
Task-number: QTQAINFRA-4477
Change-Id: Ie8ce60c4e6d9b948be2ff813b599a2d8f6d75099
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit d9be0951b439a059e01165102ee3719b845e07d7)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 4 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-disable_net_lso.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-disable_net_lso.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-install_telegraf.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-install_telegraf.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-systemsetup.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/02-disable-ntp.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-disable-ntp.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/03-enable-repos.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/03-enable-repos.sh) | 8 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/04-zypperpackages.sh) | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-libclang-v100-dyn.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-libclang.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/08-pythondev.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-pythondev.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/09-cmake.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/09-cmake.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/18-icc.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/18-icc.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/20-sccache.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/20-sccache.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/22-mqtt_broker.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-conan.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/55-emsdk.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/55-emsdk.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/70-install_QemuGA.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/70-install_QemuGA.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-squish.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/90-squish.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-unset-proxy.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-unset-proxy.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-version.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-version.sh) | 0 |
20 files changed, 9 insertions, 6 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 86b0bcc6..6b2929f2 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -46,14 +46,14 @@ 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.2-x86_64-50' + 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/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 index c404c366..c404c366 100644 --- 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 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 index 729f9003..729f9003 100755 --- 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 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 index d3724ceb..d3724ceb 100755 --- 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 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 index 38707a8a..38707a8a 100755 --- 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 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 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 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 index b0080cbc..b0080cbc 100755 --- 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 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 index bbe2b4b4..bbe2b4b4 100755 --- 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 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 index ab966a02..ab966a02 100755 --- 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 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 index 5eb53566..5eb53566 100755 --- 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 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 index 2832ad79..2832ad79 100755 --- 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 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 index b371d947..b371d947 100755 --- 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 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 index e677427f..e677427f 100755 --- 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 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 index b8820053..b8820053 100755 --- 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 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 index 44cf1b80..44cf1b80 100755 --- 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 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 index ef37af1c..ef37af1c 100755 --- 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 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 index e4281588..e4281588 100755 --- 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 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 index 5ff78055..5ff78055 100755 --- 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 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 index 03565da2..03565da2 100755 --- 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 |