aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2020-09-16 12:57:26 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2020-10-12 19:28:28 +0300
commitf1e911e3446c1b9f3b938618af9ac71b54fdbc8c (patch)
tree42778c8fcf928f1c891b65e9f8c3df98b8b7f244
parenta892a2ca19ad658869dbbaa4eac1e4d4bdcd1afe (diff)
Provisioning: Replace SLES-15 with SLES-15 SP2
Task-number: QTQAINFRA-3921 Change-Id: I325a4b8f272dda80168aed1389e647bbd525b10f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml2
-rw-r--r--coin/platform_configs/default.yaml2
-rw-r--r--coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS47
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh8
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh7
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-btrfs-balance.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh)0
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-fstrim_timer.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-enable-modules.sh10
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-install_telegraf.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-gnome-notifications.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-ntp.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-pythondev.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/09-cmake.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/09-cmake.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/18-icc.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/20-sccache.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/20-sccache.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/55-emsdk.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/90-squish.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-unset-proxy.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-version.sh (renamed from coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh)0
24 files changed, 65 insertions, 17 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 44877213..388c21a2 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -29,7 +29,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-x86_64'
+ Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DBUILD_EXAMPLES=OFF -FEATURE_developer_build=ON -DBUILD_WITH_PCH=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/default.yaml b/coin/platform_configs/default.yaml
index 8ca524cb..0d982767 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -22,7 +22,7 @@ Configurations:
Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
-
- Template: 'qtci-linux-SLES-15-x86_64'
+ Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
Compiler: 'GCC'
Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
diff --git a/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS
new file mode 100644
index 00000000..849b2333
--- /dev/null
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS
@@ -0,0 +1,47 @@
+### SUSE Linux Enterprise Desktop 15 SP2 ###
+
+Language: English (US)
+Keyboard Layout: English (US)
+
+Available Extensions and Modules:
+ Basesystem Module
+ Desktop Applications Module
+ Python 2 Module
+
+Gnome Desktop (X11)
+
+Resolution 1280x800
+
+# Settings
+Notification Popups - disabled
+LockScreen Notifications - disabled
+
+# Privacy
+Screen Lock - Off
+
+# Power
+Power Saving - Blank Screen - never
+
+# Add user to sudoers
+Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
+
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_386/coin-setup
+sudo ./coin-setup
+
+# Add support for virtio driver
+sudo echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
+sudo dracut -f
+
+# Add these to '/etc/polkit-default-privs.local'
+org.freedesktop.udisks2.filesystem-mount yes
+org.freedesktop.udisks2.filesystem-mount-other-seat yes
+org.freedesktop.udisks2.filesystem-mount-system yes
+org.freedesktop.login1.power-off yes
+org.freedesktop.login1.power-off-ignore-inhibit yes
+org.freedesktop.login1.power-off-multiple-sessions yes
+
+# Register product
+# Add 'Available Extensions and Modules'
+* Basesystem Module 15 SP2 x86_64
+* Server Applications Module 15 SP2 x86_64
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index 8790a070..690299b7 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -70,7 +70,11 @@ zip="/tmp/libclang.7z"
destination="/usr/local/libclang-$version"
DownloadURL $url_cached $url $sha1 $zip
-sudo 7z x $zip -o/usr/local/
+if command -v 7zr &> /dev/null; then
+ sudo 7zr x $zip -o/usr/local/
+else
+ sudo 7z x $zip -o/usr/local/
+fi
sudo mv /usr/local/libclang "$destination"
rm -rf $zip
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh
deleted file mode 100755
index 166fb1e2..00000000
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# this script will remove executable rights from cron.daily jobs
-sudo chmod -x /etc/cron.daily/*
-
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh
deleted file mode 100755
index 4f1d3768..00000000
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-openssl.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-btrfs-balance.sh
index a0126cb2..a0126cb2 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-btrfs-balance.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-fstrim_timer.sh
index 9fd06e72..9fd06e72 100644..100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-fstrim_timer.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-enable-modules.sh
new file mode 100755
index 00000000..4130920f
--- /dev/null
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-enable-modules.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# Activate these modules
+# Note! Modules'Server Applications Module 15 SP2 x86_64' & 'Server Applications Module 15 SP2 x86_64' were enabled during registrarion phase
+sudo SUSEConnect -p sle-module-desktop-applications/15.2/x86_64
+sudo SUSEConnect -p sle-module-development-tools/15.2/x86_64
+sudo SUSEConnect --product sle-module-python2/15.2/x86_64
+
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-install_telegraf.sh
index 729f9003..729f9003 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-install_telegraf.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-systemsetup.sh
index 28f25728..28f25728 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-systemsetup.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-gnome-notifications.sh
index f38c9bab..f38c9bab 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-gnome-notifications.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-ntp.sh
index 38707a8a..38707a8a 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-ntp.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
index 5b21a0c0..5b21a0c0 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang.sh
index bbe2b4b4..bbe2b4b4 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-pythondev.sh
index 2da45c2b..2da45c2b 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-pythondev.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/09-cmake.sh
index 5eb53566..5eb53566 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/09-cmake.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/18-icc.sh
index 7ab8528a..7ab8528a 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/18-icc.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/20-sccache.sh
index b371d947..b371d947 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/20-sccache.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/20-sccache.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/22-mqtt_broker.sh
index e677427f..e677427f 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/22-mqtt_broker.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/55-emsdk.sh
index 44cf1b80..44cf1b80 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/55-emsdk.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/90-squish.sh
index e4281588..e4281588 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/90-squish.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-unset-proxy.sh
index 5ff78055..5ff78055 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-unset-proxy.sh
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-version.sh
index 03565da2..03565da2 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-version.sh