From 530f00502a72fb6807afe5150efd214da98e614a Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Thu, 26 Oct 2023 12:35:59 +0300 Subject: [PATCH] Provisioning: Fix SLES 15 SP5 packagekit flakiness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-5899 Change-Id: Ie5070cc4d99e7fe451c394c3078aeb60e8332fff Reviewed-by: Tony Sarajärvi --- .../01-systemsetup.sh | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh index 6c59e232..dcbbfea9 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh @@ -27,22 +27,19 @@ echo "Set DISPLAY" echo 'export DISPLAY=":0"' >> ~/.bashrc echo "Checking packagekit status" -sudo systemctl status packagekit +sudo systemctl status packagekit || true + +while sudo systemctl is-active packagekit >/dev/null 2>&1 ; do + echo "Waiting for PackageKit to finish..." + sudo systemctl is-active packagekit + sleep 5 +done -# This can be optimized in future if some sleep steps or even stop -command is not needed -# SP5 finally worked with this setup and would've needed new provisioning to optimize more -echo "Packagekit needs waiting with proper order for disposal.." -sudo systemctl disable packagekit -sudo sleep 2m sudo systemctl stop packagekit -sudo sleep 2m +sudo systemctl disable packagekit # With --now this could stop and disable sudo systemctl mask packagekit -sudo sleep 2m -# This caused failing, commented out if possible to take this approach back later -#while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do -# echo "Waiting for PackageKit to finish..." -# sleep 5 -#done +sudo systemctl status packagekit || true + sudo zypper -nq remove gnome-software # shellcheck disable=SC2031