From 569680033fd77dc77a2d5a29903ffe8709b7a948 Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Thu, 12 Oct 2023 11:33:14 -0500
Subject: [PATCH] Use retries instead

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 jenkins-scripts/lib/_homebrew_cleanup.bash | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jenkins-scripts/lib/_homebrew_cleanup.bash b/jenkins-scripts/lib/_homebrew_cleanup.bash
index 0b31ede4f..76cd0fb93 100644
--- a/jenkins-scripts/lib/_homebrew_cleanup.bash
+++ b/jenkins-scripts/lib/_homebrew_cleanup.bash
@@ -39,8 +39,15 @@ git stash && git clean -d -f
 ${BREW_BINARY} audit cmake || restore_brew
 popd 2> /dev/null
 
-# Remove any locks to avoid any errors about another active Homebrew process being active.
-rm -rf $(${BREW_BINARY} --prefix)/var/homebrew/locks
+# There might be a background process that blocks `brew update`, so we try to
+# run it several times until it succeeds.
+# See https://github.com/Homebrew/brew/issues/1155
+brew_update_retry_count=0
+until brew update || (( brew_update_retry_count++ > 6 ))
+do
+  brew update
+  sleep 10
+done
 
 # test-bot needs variables and does not work just with config not sure why
 export GIT_AUTHOR_NAME="OSRF Build Bot"