]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
sepia-fog-images: look for deploy tasks only of the image being captured 2307/head
authorDan Mick <dmick@redhat.com>
Thu, 19 Sep 2024 00:18:15 +0000 (17:18 -0700)
committerDan Mick <dmick@redhat.com>
Fri, 13 Dec 2024 22:27:56 +0000 (14:27 -0800)
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>
sepia-fog-images/build/build

index 904ecff2fe5f60a48e64cf36b29de84163228b2c..9bd5023fea773ec9683c91423bf1afaf0c48abbb 100755 (executable)
@@ -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