try_to_dequeue_head

rootfs/scripts/utils.sh

@@ -109,7 +109,7 @@ wait_for_lock() {
 			__exit_code=$? # timeout returns 143
 
 		if [ $__exit_code -eq 143 ]; then
-			dequeue_head $1 $2 $3
+			try_to_dequeue_head $1 $2 $3
 		fi
 	done
 }
@@ -162,15 +162,11 @@ dequeue() {
 #   $1: branch
 #   $2: queue_file
 #   $3: ticket_id
-dequeue_head() {
+try_to_dequeue_head() {
 	__branch=$1
 	__queue_file=$2
 	__ticket_id=$3
 
-	__has_error=0
-
-	update_branch $__branch
-
 	# Remove head
 	cur_lock=$(head -n 1 $__queue_file)
 	echo "[$__ticket_id] Waiting for lock - Force unlocking [$cur_lock]"
@@ -180,13 +176,5 @@ dequeue_head() {
 	git add $__queue_file
 	git commit -m "$__message" --quiet
 
-	set +e # allow errors
-	git push --set-upstream origin $__branch --quiet
-	__has_error=$((__has_error + $?))
-	set -e
-
-	if [ ! $__has_error -eq 0 ]; then
-		sleep 1
-		dequeue_head $@
-	fi
+	git push --set-upstream origin $__branch --quiet || true
 }