From 5cfcdbd4165dada02bd2a23c9719f7550c6c08ee Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Thu, 27 Mar 2025 01:41:49 +0000
Subject: [PATCH] Robust registry operations: adjust timelimit and use retries
 (#2270)

---
 .github/workflows/docker-merge-tags.yml | 16 ++++++++++------
 .github/workflows/docker-tag-push.yml   |  6 ++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-merge-tags.yml b/.github/workflows/docker-merge-tags.yml
index 9201b6b7..19d755d3 100644
--- a/.github/workflows/docker-merge-tags.yml
+++ b/.github/workflows/docker-merge-tags.yml
@@ -18,7 +18,7 @@ on:
       timeout-minutes:
         description: Timeout in minutes
         type: number
-        default: 25
+        default: 10
     secrets:
       REGISTRY_USERNAME:
         required: true
@@ -67,9 +67,13 @@ jobs:
 
       - name: Merge tags for the images 🔀
         if: env.PUSH_TO_REGISTRY == 'true'
-        run: >
-          python3 -m tagging.apps.merge_tags
-          --image ${{ inputs.image }}
-          --variant ${{ inputs.variant }}
-          --tags-dir /tmp/jupyter/tags/
+        run: |
+          python3 -m tagging.apps.merge_tags \
+            --image ${{ inputs.image }} \
+            --variant ${{ inputs.variant }} \
+            --tags-dir /tmp/jupyter/tags/ || \
+          python3 -m tagging.apps.merge_tags \
+            --image ${{ inputs.image }} \
+            --variant ${{ inputs.variant }} \
+            --tags-dir /tmp/jupyter/tags/
         shell: bash
diff --git a/.github/workflows/docker-tag-push.yml b/.github/workflows/docker-tag-push.yml
index 3f1f85c3..504a064c 100644
--- a/.github/workflows/docker-tag-push.yml
+++ b/.github/workflows/docker-tag-push.yml
@@ -22,7 +22,7 @@ on:
         type: string
       timeout-minutes:
         description: Timeout in minutes
-        default: 25
+        default: 10
         type: number
     secrets:
       REGISTRY_USERNAME:
@@ -75,5 +75,7 @@ jobs:
 
       - name: Push Images to Registry 📤
         if: env.PUSH_TO_REGISTRY == 'true'
-        run: docker push --all-tags ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }}
+        run: |
+          docker push --all-tags ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }} || \
+          docker push --all-tags ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }}
         shell: bash