From 101073bc4e31995fdb879c6ff08715160ffaa1cb Mon Sep 17 00:00:00 2001
From: "robert.tomczyk" <robert.tomczyk@est.tech>
Date: Mon, 14 Mar 2022 14:27:17 +0000
Subject: [PATCH] Wait for backgroup apt upgrade

Make sure the backgrund apt upgrade finish before
we proceed with the job

Change-Id: Ifb12a085b39096827715754cd38d00c3e00654df
---
 jjb/infra/update-jenkins-slave.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/jjb/infra/update-jenkins-slave.sh b/jjb/infra/update-jenkins-slave.sh
index 9473aae0..6d8bdd01 100644
--- a/jjb/infra/update-jenkins-slave.sh
+++ b/jjb/infra/update-jenkins-slave.sh
@@ -3,6 +3,19 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+# Wait for other apt process to finish by checking the dpkg lock file.
+try=0
+while sudo lsof ${DPKG_LOCK}  > /dev/null 2>&1 ; do
+  echo "DPKG file locked: ${DPKG_LOCK}."
+  echo "   Waiting for another pkg instalaltion process to finish ..."
+  sleep 10
+  if [[ ${try} -gt 60 ]] ; then
+    echo "ERROR: Max number of re-tries reached, exiting..."
+    exit 1
+  fi
+  try=$((try + 1))
+done
+
 sudo apt install -y -q=3 python3-minimal python3-pip virtualenv
 
 # workaround for https://github.com/pypa/virtualenv/issues/1029
@@ -35,4 +48,4 @@ echo "Info: Updating the CI slave image"
 cd "infra/jenkins/slave-setup/${TARGET}/"
 packer validate *-ubuntu*.json
 packer build *-ubuntu*.json
-echo "----------------------------------------------------"
\ No newline at end of file
+echo "----------------------------------------------------"
-- 
2.25.1