Skip to content

Commit 909579b

Browse files
authored
Merge pull request #139 from MikelAlejoBR/fix-konflux-jobs
fix: Konflux jobs
2 parents d835abb + 9c2559b commit 909579b

File tree

3 files changed

+46
-24
lines changed

3 files changed

+46
-24
lines changed

.tekton/sources-superkey-worker-pull-request.yaml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -423,10 +423,27 @@ spec:
423423
- "false"
424424
- name: sast-coverity-check
425425
params:
426-
- name: image-digest
427-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
428426
- name: image-url
429427
value: $(tasks.build-image-index.results.IMAGE_URL)
428+
- name: IMAGE
429+
value: $(params.output-image)
430+
- name: DOCKERFILE
431+
value: $(params.dockerfile)
432+
- name: CONTEXT
433+
value: $(params.path-context)
434+
- name: HERMETIC
435+
value: $(params.hermetic)
436+
- name: PREFETCH_INPUT
437+
value: $(params.prefetch-input)
438+
- name: IMAGE_EXPIRES_AFTER
439+
value: $(params.image-expires-after)
440+
- name: COMMIT_SHA
441+
value: $(tasks.clone-repository.results.commit)
442+
- name: BUILD_ARGS
443+
value:
444+
- $(params.build-args[*])
445+
- name: BUILD_ARGS_FILE
446+
value: $(params.build-args-file)
430447
runAfter:
431448
- coverity-availability-check
432449
taskRef:
@@ -448,14 +465,9 @@ spec:
448465
values:
449466
- success
450467
workspaces:
451-
- name: workspace
468+
- name: source
452469
workspace: workspace
453470
- name: coverity-availability-check
454-
params:
455-
- name: image-digest
456-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
457-
- name: image-url
458-
value: $(tasks.build-image-index.results.IMAGE_URL)
459471
runAfter:
460472
- build-image-index
461473
taskRef:
@@ -472,9 +484,6 @@ spec:
472484
operator: in
473485
values:
474486
- "false"
475-
workspaces:
476-
- name: workspace
477-
workspace: workspace
478487
- name: sast-shell-check
479488
params:
480489
- name: image-digest

.tekton/sources-superkey-worker-push.yaml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -420,10 +420,27 @@ spec:
420420
- "false"
421421
- name: sast-coverity-check
422422
params:
423-
- name: image-digest
424-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
425423
- name: image-url
426424
value: $(tasks.build-image-index.results.IMAGE_URL)
425+
- name: IMAGE
426+
value: $(params.output-image)
427+
- name: DOCKERFILE
428+
value: $(params.dockerfile)
429+
- name: CONTEXT
430+
value: $(params.path-context)
431+
- name: HERMETIC
432+
value: $(params.hermetic)
433+
- name: PREFETCH_INPUT
434+
value: $(params.prefetch-input)
435+
- name: IMAGE_EXPIRES_AFTER
436+
value: $(params.image-expires-after)
437+
- name: COMMIT_SHA
438+
value: $(tasks.clone-repository.results.commit)
439+
- name: BUILD_ARGS
440+
value:
441+
- $(params.build-args[*])
442+
- name: BUILD_ARGS_FILE
443+
value: $(params.build-args-file)
427444
runAfter:
428445
- coverity-availability-check
429446
taskRef:
@@ -445,14 +462,9 @@ spec:
445462
values:
446463
- success
447464
workspaces:
448-
- name: workspace
465+
- name: source
449466
workspace: workspace
450467
- name: coverity-availability-check
451-
params:
452-
- name: image-digest
453-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
454-
- name: image-url
455-
value: $(tasks.build-image-index.results.IMAGE_URL)
456468
runAfter:
457469
- build-image-index
458470
taskRef:
@@ -469,9 +481,6 @@ spec:
469481
operator: in
470482
values:
471483
- "false"
472-
workspaces:
473-
- name: workspace
474-
workspace: workspace
475484
- name: sast-shell-check
476485
params:
477486
- name: image-digest

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ WORKDIR /build
33

44
RUN microdnf install go
55

6+
# We need to override the toolchain to the latest version because
7+
# unfortunately the latest "ubi8" image does not contain the go version 1.23,
8+
# which is required for the latest dependency updates.
9+
610
COPY go.mod .
7-
RUN go mod download
11+
RUN GOTOOLCHAIN=go1.23.5 go mod download
812

913
COPY . .
10-
RUN go build
14+
RUN GOTOOLCHAIN=go1.23.5 go build
1115

1216
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
1317
COPY --from=build /build/sources-superkey-worker /sources-superkey-worker

0 commit comments

Comments
 (0)