aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2021-06-23 12:27:57 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2021-11-04 18:47:43 +0200
commita80c83533329d7a0c8e4b44ed40b98bfc06e9743 (patch)
treedba7b0e483cdbedcdb46e60a82e2d6269d0d4f09
parent5893f0d3dff8d01d39d8758a67c7ba2d9dc645e3 (diff)
Replace SLES 15 SP2 with SP3
Task-number: QTQAINFRA-4498 Change-Id: I248a0ea19a7e2af59350ba66b55983c20927fff3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 426bab28a81a17dd5feb70e9558f6edba610d17c) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml2
-rw-r--r--coin/platform_configs/cmake_platforms_static_tests.yaml2
-rw-r--r--coin/pre-provisioning/qtci-linux-SLES-15_SP3-x86_64/README_MANUAL_INSTALLATIONS (renamed from coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS)15
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-btrfs-balance.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-btrfs-balance.sh)0
-rw-r--r--coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-coredump.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-coredump.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-fstrim_timer.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-fstrim_timer.sh)0
-rw-r--r--coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable_net_lso.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable_net_lso.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-install_telegraf.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-install_telegraf.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-systemsetup.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-gnome-notifications.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-gnome-notifications.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-ntp.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-ntp.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-enable-modules.sh)10
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh)4
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang-v100-dyn.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-pythondev.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-pythondev.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/09-cmake.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/09-cmake.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/20-sccache.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/20-sccache.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/22-mqtt_broker.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-conan.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/55-emsdk.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/55-emsdk.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/70-install_QemuGA.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/70-install_QemuGA.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/90-squish.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/90-squish.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-unset-proxy.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-unset-proxy.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-version.sh (renamed from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-version.sh)0
25 files changed, 21 insertions, 12 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index af9579ac..15039002 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -63,7 +63,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-SLES-15_SP2-x86_64-50'
+ Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml
index df01c8ee..7526970c 100644
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
- Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
+ Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'MinimalStaticTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
diff --git a/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-SLES-15_SP3-x86_64/README_MANUAL_INSTALLATIONS
index 849b2333..6fe4943b 100644
--- a/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP3-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,4 +1,4 @@
-### SUSE Linux Enterprise Desktop 15 SP2 ###
+### SUSE Linux Enterprise Desktop 15 SP3 ###
Language: English (US)
Keyboard Layout: English (US)
@@ -7,9 +7,13 @@ Available Extensions and Modules:
Basesystem Module
Desktop Applications Module
Python 2 Module
+ Server Applications Module
Gnome Desktop (X11)
+Enable SSH service
+Disable Firewall
+
Resolution 1280x800
# Settings
@@ -41,7 +45,12 @@ org.freedesktop.login1.power-off yes
org.freedesktop.login1.power-off-ignore-inhibit yes
org.freedesktop.login1.power-off-multiple-sessions yes
+sudo /sbin/set_polkit_default_privs
+
+# Set how DHClient creates CID for compatibility with older DHCP servers
+sudo sed -i 's/DHCLIENT_CREATE_CID=""/DHCLIENT_CREATE_CID="rfc2132"/' /etc/sysconfig/network/dhcp
+
# Register product
# Add 'Available Extensions and Modules'
-* Basesystem Module 15 SP2 x86_64
-* Server Applications Module 15 SP2 x86_64
+* Basesystem Module 15 SP3 x86_64
+* Server Applications Module 15 SP3 x86_64
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-btrfs-balance.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-btrfs-balance.sh
index a0126cb2..a0126cb2 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-btrfs-balance.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-btrfs-balance.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-coredump.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-coredump.sh
index d078f9c7..d078f9c7 100644
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-coredump.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-coredump.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-fstrim_timer.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-fstrim_timer.sh
index 9fd06e72..9fd06e72 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-fstrim_timer.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-fstrim_timer.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable_net_lso.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable_net_lso.sh
index f9b32149..f9b32149 100644
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable_net_lso.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable_net_lso.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-install_telegraf.sh
index 729f9003..729f9003 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-install_telegraf.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-install_telegraf.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-systemsetup.sh
index 28f25728..28f25728 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-systemsetup.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-gnome-notifications.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-gnome-notifications.sh
index f38c9bab..f38c9bab 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-gnome-notifications.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-gnome-notifications.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-ntp.sh
index 38707a8a..38707a8a 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-ntp.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh
index dc1b33e7..46322103 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-enable-modules.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh
@@ -8,10 +8,10 @@ sudo SUSEConnect --cleanup
sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint C9:4F:0B:81:DE:84:AF:F2:50:3E:89:B9:7F:BC:63:BB:A7:AC:BE:97
# Activate these modules
-sudo SUSEConnect -p sle-module-basesystem/15.2/x86_64
-sudo SUSEConnect -p sle-module-server-applications/15.2/x86_64
-sudo SUSEConnect -p sle-module-desktop-applications/15.2/x86_64
-sudo SUSEConnect -p sle-module-development-tools/15.2/x86_64
-sudo SUSEConnect -p sle-module-python2/15.2/x86_64
+sudo SUSEConnect -p sle-module-basesystem/15.3/x86_64
+sudo SUSEConnect -p sle-module-server-applications/15.3/x86_64
+sudo SUSEConnect -p sle-module-desktop-applications/15.3/x86_64
+sudo SUSEConnect -p sle-module-development-tools/15.3/x86_64
+sudo SUSEConnect -p sle-module-python2/15.3/x86_64
sudo zypper lr -u
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh
index 4606f8eb..42beba81 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh
@@ -70,14 +70,14 @@ sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel
sudo zypper -nq install gtk3-devel
# Xinput2
-sudo zypper -nq install libXi-devel postgresql10 postgresql10-devel mysql-devel mysql mysql-server
+sudo zypper -nq install libXi-devel postgresql13 postgresql13-devel mysql-devel mysql mysql-server
# system provided XCB libraries
sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \
xcb-util-wm-devel xcb-util-renderutil-devel
# ICU
-sudo zypper -nq install libicu-devel libicu60_2
+sudo zypper -nq install libicu-devel libicu-suse65_1
# qtwebengine
sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang-v100-dyn.sh
index b0080cbc..b0080cbc 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang-v100-dyn.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang.sh
index bbe2b4b4..bbe2b4b4 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-pythondev.sh
index 2da45c2b..2da45c2b 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-pythondev.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/09-cmake.sh
index 5eb53566..5eb53566 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/09-cmake.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/20-sccache.sh
index b371d947..b371d947 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/20-sccache.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/20-sccache.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/22-mqtt_broker.sh
index e677427f..e677427f 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/22-mqtt_broker.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-conan.sh
index b8820053..b8820053 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-conan.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/55-emsdk.sh
index 44cf1b80..44cf1b80 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/55-emsdk.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/55-emsdk.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/70-install_QemuGA.sh
index ef37af1c..ef37af1c 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/70-install_QemuGA.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/70-install_QemuGA.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/90-squish.sh
index e4281588..e4281588 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/90-squish.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-unset-proxy.sh
index 5ff78055..5ff78055 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-unset-proxy.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-unset-proxy.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-version.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-version.sh
index 03565da2..03565da2 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-version.sh