Skip to content

Commit 97e04a5

Browse files
committed
fix: fixes
1 parent 23e28c2 commit 97e04a5

1 file changed

Lines changed: 14 additions & 10 deletions

File tree

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,13 @@ spec:
114114
- name: sourceDataArtifact
115115
value: $(params.sourceDataArtifact)
116116
- name: collect-index-images
117-
image:
118-
quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
117+
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
119118
computeResources:
120119
limits:
121-
memory: 128Mi
120+
memory: 3Gi
122121
requests:
123-
memory: 128Mi
124-
cpu: 50m
122+
memory: 3Gi
123+
cpu: 1
125124
script: |
126125
#!/usr/bin/env bash
127126
set -eux
@@ -138,7 +137,11 @@ spec:
138137
139138
request="inspect-target-index-pipeline"
140139
credentials=$(jq -r '.fbc.publishingCredentials' "$DATA_FILE")
141-
pipelinerun_label="internal-services.appstudio.openshift.io/pipelinerun-uid"
140+
141+
# Setup consistent labeling for FBC internal requests
142+
TASK_LABEL="internal-services.appstudio.openshift.io/group-id"
143+
TASK_ID=$(context.taskRun.uid)
144+
PIPELINERUN_LABEL="internal-services.appstudio.openshift.io/pipelinerun-uid"
142145
143146
LENGTH="$(jq -r '.components | length' "$RESULTS_FILE")"
144147
for((i=0; i<LENGTH; i++)); do
@@ -170,10 +173,11 @@ spec:
170173
-p inspectCredentials="${credentials}" \
171174
-p taskGitUrl="$(params.taskGitUrl)" \
172175
-p taskGitRevision="$(params.taskGitRevision)" \
173-
-l ${pipelinerun_label}="$(params.pipelineRunUid)" \
174-
| tee "$IR_RESULT_FILE" || \
175-
(grep "^\[" "$IR_RESULT_FILE" | jq . && exit 1)
176-
176+
-l ${TASK_LABEL}="${TASK_ID}" \
177+
-l ${PIPELINERUN_LABEL}="$(params.pipelineRunUid)" \
178+
-t 120 \
179+
| tee "$IR_RESULT_FILE" #|| \
180+
#(grep "^\[" "$IR_RESULT_FILE" | jq . && exit 1)
177181
internalRequest=$(awk -F"'" '/created/ { print $2 }' "$IR_RESULT_FILE")
178182
results=$(kubectl get internalrequest "${internalRequest}" -o=jsonpath='{.status.results}')
179183
requestMessage=$(echo "${results}" | jq -r '.requestMessage // ""')

0 commit comments

Comments
 (0)