Merge pull request #1546 from openshift-cherrypick-robot/cherry-pick-1544-to-18.0-fr3

[18.0-fr3] [bindata] catch skopeo copy failures

Author: openshift-merge-bot[bot]

hack/sync-bindata.sh

@@ -142,13 +142,21 @@ EOF_CAT
 }
 
 for BUNDLE in $(hack/pin-bundle-images.sh | tr "," " "); do
-    n=0
-    until [ "$n" -ge 5 ]; do
-        skopeo copy "docker://$BUNDLE" dir:${EXTRACT_DIR}/tmp && break
-        echo "Command failed. retrying ... $n/5"
-        n=$((n+1))
-        sleep 15
-    done
+    (
+        set +e
+        n=0
+        RC=1
+        while :; do
+            skopeo copy "docker://$BUNDLE" dir:${EXTRACT_DIR}/tmp
+            RC=$?
+            if [ $RC -eq 0 -o "$n" -ge 5 ]; then
+                exit $RC
+            fi
+            n=$((n+1))
+            echo "Command failed. retrying ... $n/5"
+            sleep 15
+        done
+    )
     extract_bundle "${EXTRACT_DIR}/tmp" "${OUT_DATA}/"
 done