From 3b264301b00dc58f58a45d7221cbe0dfc025d2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 10 Jan 2020 13:07:49 +0000 Subject: [PATCH] Update openSUSE to 15.1 Task-number: QTQAINFRA-3455 Change-Id: Ie795f19c26ab0c42693388696edb344b4fa121a6 Reviewed-by: Qt CI Bot Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 6 +++--- coin/platform_configs/qtbase.yaml | 2 +- .../01-install_telegraf.sh | 0 .../01-systemsetup.sh | 0 .../02-disable-ntp.sh | 0 .../02-zypperpackages.sh | 0 .../08-libclang.sh | 0 .../08-pythondev.sh | 2 +- .../09-cmake.sh | 0 .../09-install-openssl.sh | 0 .../18-icc.sh | 0 .../22-mqtt_broker.sh | 0 .../55-emsdk.sh | 0 .../90-squish.sh | 0 .../99-unset-proxy.sh | 0 .../99-version.sh | 0 16 files changed, 5 insertions(+), 5 deletions(-) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/01-install_telegraf.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/01-systemsetup.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/02-disable-ntp.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/02-zypperpackages.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/08-libclang.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/08-pythondev.sh (91%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/09-cmake.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/09-install-openssl.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/18-icc.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/22-mqtt_broker.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/55-emsdk.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/90-squish.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/99-unset-proxy.sh (100%) rename coin/provisioning/{qtci-linux-openSUSE-15.0-x86_64 => qtci-linux-openSUSE-15.1-x86_64}/99-version.sh (100%) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index ea57fb93..096d2504 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -55,16 +55,16 @@ Configurations: Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Compiler: 'ICC_18' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 680a9bbf..f1b6ca7b 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -19,7 +19,7 @@ Compiler: 'MSVC2015' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' - - Template: 'qtci-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['DisableTests'] diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh similarity index 91% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh index 12dabace..ab966a02 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh @@ -5,7 +5,7 @@ set -ex -sudo zypper -nq install python-devel python-virtualenv +sudo zypper -nq install python-devel python-xml # install python3 sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh rename to coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh