From: Dan Mick <dmick@redhat.com>
Date: Thu, 19 Sep 2024 00:18:15 +0000 (-0700)
Subject: sepia-fog-images: look for deploy tasks only of the image being captured
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2307%2Fhead;p=ceph-build.git

sepia-fog-images: look for deploy tasks only of the image being captured

It doesn't matter if there are deploy tasks for other images, only for
the one we're about to capture

Signed-off-by: Dan Mick <dmick@redhat.com>
---

diff --git a/sepia-fog-images/build/build b/sepia-fog-images/build/build
index 904ecff2f..9bd5023fe 100755
--- a/sepia-fog-images/build/build
+++ b/sepia-fog-images/build/build
@@ -236,7 +236,7 @@ if [ "$PAUSEQUEUE" == "true" ]; then
     while [ $deploytasks -gt 0 ]; do
       echo "$(date) -- $deploytasks FOG deploy tasks still queued.  Sleeping 10sec"
       sleep 10
-      deploytasks=$(curl -f -s -k -H "fog-api-token: ${FOG_API_TOKEN}" -H "fog-user-token: ${FOG_USER_TOKEN}" http://fog.front.sepia.ceph.com/fog/task/active -d '{"typeID": "'${fogdeployid}'"}' -X GET | jq -r '.count')
+      deploytasks=$(curl -f -s -k -H "fog-api-token: ${FOG_API_TOKEN}" -H "fog-user-token: ${FOG_USER_TOKEN}" http://fog.front.sepia.ceph.com/fog/task/active -d '{"typeID": "'${fogdeployid}'", "imageID": "'${fogimageid}'"}' -X GET | jq -r '.count')
       ((++currentretries))
       # Retry for 1hr
       funRetry $currentretries 360