fix: user index_image_resolved as source

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

Author: theflockers

tasks/managed/collect-index-images/collect-index-images.yaml

@@ -130,61 +130,53 @@ spec:
           TARGETINDEX_TS=$(jq -r --argjson i "$i" '.components[$i].target_index_with_timestamp' "$RESULTS_FILE")
           SOURCEINDEX=$(jq -r  --argjson i "$i" '.components[$i].index_image_resolved' "$RESULTS_FILE")
           IMAGE_DIGESTS=$(jq -c --argjson i "$i" '.components[$i].image_digests // []' "$RESULTS_FILE")
-          COMPLETION_TIME=$(jq -r --argjson i "$i" '.components[$i].completion_time // empty' "$RESULTS_FILE")
 
-          # Validate completion_time is present
-          if [[ -z "${COMPLETION_TIME}" || "${COMPLETION_TIME}" == "null" ]]; then
-              echo "ERROR: Component $i missing completion_time in results file"
-              exit 1
-          fi
+          # create pyxis entry for the component for tags in separated
+          for TARGET in $TARGETINDEX $TARGETINDEX_TS; do
+            REPOSITORY=${TARGET%:*}
 
-          REPOSITORY=${TARGETINDEX%:*}
+            TAG=${TARGET#*:}
+            TAGS=("${TAG}")
+            JSON_TAGS=$(jq -n -c '$ARGS.positional' --args -- "${TAGS[@]}")
 
-          TAG=${TARGETINDEX#*:}
-          TAGS=("${TAG}")
-          if [[ "${TARGETINDEX}" != "${TARGETINDEX_TS}" ]]; then
-            TAG=${TARGETINDEX_TS#*:}
-            TAGS+=("${TAG}")
-          fi
-          JSON_TAGS=$(jq -n -c '$ARGS.positional' --args -- "${TAGS[@]}")
+            # Translate target_index to get rh-registry-repo and registry-access-repo
+            TRANSLATED=$(translate-delivery-repo "$TARGETINDEX")
+            RH_REGISTRY_REPO=$(jq -r '.[] | select(.repo=="redhat.io") | .url' <<< "$TRANSLATED" \
+              | cut -d':' -f1)
+            REGISTRY_ACCESS_REPO=$(jq -r '.[] | select(.repo=="access.redhat.com") | .url' \
+              <<< "$TRANSLATED" | cut -d':' -f1)
 
-          # Translate target_index to get rh-registry-repo and registry-access-repo
-          TRANSLATED=$(translate-delivery-repo "$TARGETINDEX")
-          RH_REGISTRY_REPO=$(jq -r '.[] | select(.repo=="redhat.io") | .url' <<< "$TRANSLATED" \
-            | cut -d':' -f1)
-          REGISTRY_ACCESS_REPO=$(jq -r '.[] | select(.repo=="access.redhat.com") | .url' \
-            <<< "$TRANSLATED" | cut -d':' -f1)
+            # Build repository object with translated fields
+            REPO_OBJECT=$(jq -n \
+              --arg url "${REPOSITORY}" \
+              --argjson tags "${JSON_TAGS}" \
+              --arg rh_registry_repo "${RH_REGISTRY_REPO}" \
+              --arg registry_access_repo "${REGISTRY_ACCESS_REPO}" \
+              '{
+                "url": $url,
+                "tags": $tags
+              } + (if $rh_registry_repo != "" then {"rh-registry-repo": $rh_registry_repo} else {} end)
+                + (if $registry_access_repo != "" then {"registry-access-repo": $registry_access_repo} else {} end)'
+            )
 
-          # Build repository object with translated fields
-          REPO_OBJECT=$(jq -n \
-            --arg url "${REPOSITORY}" \
-            --argjson tags "${JSON_TAGS}" \
-            --arg rh_registry_repo "${RH_REGISTRY_REPO}" \
-            --arg registry_access_repo "${REGISTRY_ACCESS_REPO}" \
-            '{
-              "url": $url,
-              "tags": $tags
-            } + (if $rh_registry_repo != "" then {"rh-registry-repo": $rh_registry_repo} else {} end)
-              + (if $registry_access_repo != "" then {"registry-access-repo": $registry_access_repo} else {} end)'
-          )
-
-          COMPONENT=$(jq -n \
-            --arg image "${SOURCEINDEX}" \
-            --arg repository "${REPOSITORY}" \
-            --argjson tags "${JSON_TAGS}" \
-            --argjson image_digests "${IMAGE_DIGESTS}" \
-            --argjson repo_object "${REPO_OBJECT}" \
-            '{
-              "containerImage": $image,
-              "repository": $repository,
-              "repositories": [$repo_object],
-              "tags": $tags,
-              "imageDigests": $image_digests
-            }'
-          )
-          export COMPONENT
-          yq -i '.components += env(COMPONENT) ' "$SNAPSHOT_FILE"
-        done
+            COMPONENT=$(jq -n \
+              --arg image "${SOURCEINDEX}" \
+              --arg repository "${REPOSITORY}" \
+              --argjson tags "${JSON_TAGS}" \
+              --argjson image_digests "${IMAGE_DIGESTS}" \
+              --argjson repo_object "${REPO_OBJECT}" \
+              '{
+                "containerImage": $image,
+                "repository": $repository,
+                "repositories": [$repo_object],
+                "tags": $tags,
+                "imageDigests": $image_digests
+              }'
+            )
+            export COMPONENT
+            yq -i '.components += env(COMPONENT) ' "$SNAPSHOT_FILE"
+          done # end taget index loop
+        done # end components loop
         echo -n "index_image_snapshot.json" > "$(results.indexImageSnapshot.path)"
     - name: create-trusted-artifact
       computeResources:

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

@@ -152,7 +152,7 @@ spec:
 
           sourceIndex="$(jq -r  --argjson i "$i" \
             '.components[$i].index_image' "$(params.dataDir)/$(params.internalRequestResultsFile)")"
-          sourceResolvedIndex="$(jq -r  --argjson i "$i" \
+          sourceIndexResolved="$(jq -r  --argjson i "$i" \
             '.components[$i].index_image_resolved' "$(params.dataDir)/$(params.internalRequestResultsFile)")"
 
           targetOcpVersion=$(jq -r --argjson i "$i" \
@@ -175,14 +175,10 @@ 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"
+                sourceIndex="$sourceIndexResolved"
               fi
-              echo "- from: ${sourceIndex}"
+              echo "- from: ${sourceIndexResolved}"
               echo "- to: ${publishingImages[$x]}"
 
               internal-request --pipeline "${request}" \