From c9721f3df08ab3aa35addf4622e6100312a7aa2e Mon Sep 17 00:00:00 2001
From: Bin Qian <bin.qian@windriver.com>
Date: Tue, 8 Jun 2021 11:01:48 -0400
Subject: [PATCH] Retry docker login

The run_docker_login fails intermittently due to authentication
failure. Currently operation is aborted without touching flag file,
which result subsequent operations are not completed.

This change is to add reattempt when docker login fails.

Closes-Bug: 1931268
Change-Id: Id6961b1b68f2fce07a3a65917eeaeadcd742f4f1
Signed-off-by: Bin Qian <bin.qian@windriver.com>
---
 sysinv/sysinv-fpga-agent/run_docker_login | 24 +++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/sysinv/sysinv-fpga-agent/run_docker_login b/sysinv/sysinv-fpga-agent/run_docker_login
index a9e2de0867..3e35d9bfa6 100644
--- a/sysinv/sysinv-fpga-agent/run_docker_login
+++ b/sysinv/sysinv-fpga-agent/run_docker_login
@@ -58,13 +58,17 @@ do
     sleep 1
 done
 
-
-res=$(docker login --password-stdin -u ${DOCKER_USERNAME} registry.local:9001 2>&1 <<< ${DOCKER_PASSWORD})
-rc=$?
-if [ ${rc} -eq 0 ]
-then
-    LOG "docker login to registry.local completed successfully"
-    touch /var/run/docker_login_done
-else
-    LOG "docker login error ${rc} ${res}"
-fi
+while true
+do
+    res=$(docker login --password-stdin -u ${DOCKER_USERNAME} registry.local:9001 2>&1 <<< ${DOCKER_PASSWORD})
+    rc=$?
+    if [ ${rc} -eq 0 ]
+    then
+        LOG "docker login to registry.local completed successfully"
+        touch /var/run/docker_login_done
+        break
+    else
+        LOG "docker login error ${rc} ${res}"
+        sleep 3
+    fi
+done