fix: use index_image_resolved for ts index

Signed-off-by: Leandro Mendes <lmendes@redhat.com>

Author: theflockers

tasks/managed/publish-index-image/publish-index-image.yaml

@@ -152,6 +152,8 @@ spec:
 
           sourceIndex="$(jq -r  --argjson i "$i" \
             '.components[$i].index_image' "$(params.dataDir)/$(params.internalRequestResultsFile)")"
+          sourceResolvedIndex="$(jq -r  --argjson i "$i" \
+            '.components[$i].index_image_resolved' "$(params.dataDir)/$(params.internalRequestResultsFile)")"
 
           targetOcpVersion=$(jq -r --argjson i "$i" \
             '.components[$i].ocp_version' "$(params.dataDir)/$(params.internalRequestResultsFile)")
@@ -173,6 +175,13 @@ spec:
           for((x=0; x<${#publishingImages[@]}; x++ )); do
               echo "=== Creating internal request to publish image:"
               echo ""
+
+              # if we are pushing the timestamped index (always the index #1), we should
+              # use index_image_resolved instead, because the target_index sha can poten_
+              # tially be changed by a concurrent fbc process.
+              if [ "$x" -eq 1 ]; then
+                sourceIndex="$sourceResolvedIndex"
+              fi
               echo "- from: ${sourceIndex}"
               echo "- to: ${publishingImages[$x]}"
 

tasks/managed/publish-index-image/tests/test-publish-index-image-with-timestamp.yaml

@@ -193,9 +193,23 @@ spec:
                   exit 1
                 fi
 
-                if [ "$(jq -r '.sourceIndex' <<< "${params}")" != "redhat.com/rh-stage/iib:01" ]; then
-                  echo "sourceIndex image does not match for IR $i"
-                  exit 1
+                sourceIndex=$(jq -r '.sourceIndex' <<< "${params}")
+                # IR 0 (first created, x=0) should use index_image (tag)
+                # IR 1 (second created, x=1) should use index_image_resolved (digest)
+                if [ $i = 0 ]; then
+                    if [ "$sourceIndex" != "redhat.com/rh-stage/iib:01" ]; then
+                      echo "sourceIndex image does not match for IR 0"
+                      echo "Expected: redhat.com/rh-stage/iib:01"
+                      echo "Got: $sourceIndex"
+                      exit 1
+                    fi
+                else
+                    if [ "$sourceIndex" != "redhat.com/rh-stage/iib@sha256:abcdefghijk" ]; then
+                      echo "sourceIndex image does not match for IR 1"
+                      echo "Expected: redhat.com/rh-stage/iib@sha256:abcdefghijk"
+                      echo "Got: $sourceIndex"
+                      exit 1
+                    fi
                 fi
 
                 targetIndex=$(jq -r '.targetIndex' <<< "${params}")

tasks/managed/publish-index-image/tests/test-publish-index-image.yaml

@@ -188,9 +188,23 @@ spec:
                     exit 1
                   fi
 
-                  if [ "$(jq -r '.sourceIndex' <<< "${params}")" != "redhat.com/rh-stage/iib:01" ]; then
-                    echo "sourceIndex image does not match"
-                    exit 1
+                  sourceIndex=$(jq -r '.sourceIndex' <<< "${params}")
+                  # IR 0 (first created, x=0) should use index_image (tag)
+                  # IR 1 (second created, x=1) should use index_image_resolved (digest)
+                  if [ $i = 0 ]; then
+                      if [ "$sourceIndex" != "redhat.com/rh-stage/iib:01" ]; then
+                        echo "sourceIndex image does not match for IR 0"
+                        echo "Expected: redhat.com/rh-stage/iib:01"
+                        echo "Got: $sourceIndex"
+                        exit 1
+                      fi
+                  else
+                      if [ "$sourceIndex" != "redhat.com/rh-stage/iib@sha256:abcdefghijk" ]; then
+                        echo "sourceIndex image does not match for IR 1"
+                        echo "Expected: redhat.com/rh-stage/iib@sha256:abcdefghijk"
+                        echo "Got: $sourceIndex"
+                        exit 1
+                      fi
                   fi
 
                   targetIndex=$(jq -r '.targetIndex' <<< "${params}")