Skip to content

Commit 7bc924d

Browse files
authored
Merge pull request #2647 from dheerajodha/EC-1360
Improve EC Task log clarity and ordering
2 parents 02ad638 + f7f6602 commit 7bc924d

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ spec:
264264
- "--effective-time=$(params.EFFECTIVE_TIME)"
265265
- "--extra-rule-data=$(params.EXTRA_RULE_DATA)"
266266
- "--output"
267-
- "text?show-successes=false"
267+
- "text=$(params.HOMEDIR)/text-report.txt?show-successes=false"
268268
- "--output"
269269
- "appstudio=$(results.TEST_OUTPUT.path)"
270270
- "--output"
@@ -317,12 +317,6 @@ spec:
317317
- "."
318318
- "$(results.TEST_OUTPUT.path)"
319319

320-
- name: info
321-
image: quay.io/conforma/cli:latest
322-
command: [printf]
323-
args:
324-
- "----- DEBUG OUTPUT -----\n"
325-
326320
- name: version
327321
image: quay.io/conforma/cli:latest
328322
command: [ec]
@@ -336,6 +330,13 @@ spec:
336330
- '{policy: .policy, key: .key, "effective-time": .["effective-time"]}'
337331
- "$(params.HOMEDIR)/report-json.json"
338332

333+
- name: detailed-report
334+
image: quay.io/conforma/cli:latest
335+
onError: continue
336+
command: ["cat"]
337+
args:
338+
- "$(params.HOMEDIR)/text-report.txt"
339+
339340
- name: assert
340341
image: quay.io/conforma/cli:latest
341342
command: [jq]

tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ spec:
245245
- "--effective-time=$(params.EFFECTIVE_TIME)"
246246
- "--extra-rule-data=$(params.EXTRA_RULE_DATA)"
247247
- "--output"
248-
- "text?show-successes=false"
248+
- "text=$(params.HOMEDIR)/text-report.txt?show-successes=false"
249249
- "--output"
250250
- "appstudio=$(results.TEST_OUTPUT.path)"
251251
- "--output"
@@ -310,18 +310,6 @@ spec:
310310
- "."
311311
- "$(results.TEST_OUTPUT.path)"
312312

313-
- name: info
314-
computeResources:
315-
requests:
316-
cpu: 100m
317-
memory: 256Mi
318-
limits:
319-
memory: 256Mi
320-
image: quay.io/conforma/cli:latest
321-
command: [printf]
322-
args:
323-
- "----- DEBUG OUTPUT -----\n"
324-
325313
- name: version
326314
computeResources:
327315
requests:
@@ -347,6 +335,13 @@ spec:
347335
- '{policy: .policy, key: .key, "effective-time": .["effective-time"]}'
348336
- "$(params.HOMEDIR)/report-json.json"
349337

338+
- name: detailed-report
339+
image: quay.io/conforma/cli:latest
340+
onError: continue
341+
command: ["cat"]
342+
args:
343+
- "$(params.HOMEDIR)/text-report.txt"
344+
350345
- name: assert
351346
computeResources:
352347
requests:

0 commit comments

Comments
 (0)