diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index f28336da..b2498060 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -62,7 +62,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_SP3-x86_64-50' + Template: 'qtci-linux-SLES-15_SP2-x86_64-50' 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 2278b38f..df01c8ee 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_SP3-x86_64-50' + Template: 'qtci-linux-SLES-15_SP2-x86_64-50' 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_SP3-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS similarity index 83% rename from coin/pre-provisioning/qtci-linux-SLES-15_SP3-x86_64/README_MANUAL_INSTALLATIONS rename to coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS index 6ee987df..849b2333 100644 --- a/coin/pre-provisioning/qtci-linux-SLES-15_SP3-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS @@ -1,4 +1,4 @@ -### SUSE Linux Enterprise Desktop 15 SP3 ### +### SUSE Linux Enterprise Desktop 15 SP2 ### Language: English (US) Keyboard Layout: English (US) @@ -7,13 +7,9 @@ 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 @@ -45,9 +41,7 @@ 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 - # Register product # Add 'Available Extensions and Modules' -* Basesystem Module 15 SP3 x86_64 -* Server Applications Module 15 SP3 x86_64 +* Basesystem Module 15 SP2 x86_64 +* Server Applications Module 15 SP2 x86_64 diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-btrfs-balance.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-btrfs-balance.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-btrfs-balance.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-btrfs-balance.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-coredump.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-coredump.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-coredump.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-coredump.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-fstrim_timer.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-fstrim_timer.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable-fstrim_timer.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable-fstrim_timer.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable_net_lso.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable_net_lso.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable_net_lso.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-disable_net_lso.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-install_telegraf.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-systemsetup.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-gnome-notifications.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-gnome-notifications.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-gnome-notifications.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-gnome-notifications.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-ntp.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-disable-ntp.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-enable-modules.sh similarity index 55% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-enable-modules.sh index 46322103..dc1b33e7 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP2-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.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 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 zypper lr -u diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh similarity index 97% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh index 42beba81..4606f8eb 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP2-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 postgresql13 postgresql13-devel mysql-devel mysql mysql-server +sudo zypper -nq install libXi-devel postgresql10 postgresql10-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 libicu-suse65_1 +sudo zypper -nq install libicu-devel libicu60_2 # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \ diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang-v100-dyn.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-libclang.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-pythondev.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/08-pythondev.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/09-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/09-cmake.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/20-sccache.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/20-sccache.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/20-sccache.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/22-mqtt_broker.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-conan.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/55-emsdk.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/55-emsdk.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/55-emsdk.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/70-install_QemuGA.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/70-install_QemuGA.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/70-install_QemuGA.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/90-squish.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/90-squish.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-unset-proxy.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-unset-proxy.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-version.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-version.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-version.sh rename to coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/99-version.sh