Skip to content

Commit aad063f

Browse files
Merge pull request openshift-kni#1514 from rbaturov/numaresources-mg-hermetic-builds-fix
Konflux: fix must gather rpm fetching
2 parents 36a0df1 + 22a08db commit aad063f

File tree

4 files changed

+25
-0
lines changed

4 files changed

+25
-0
lines changed

.konflux/must-gather/rpms.lock.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,12 @@ arches:
1818
name: rsync
1919
evr: 3.2.3-19.el9
2020
sourcerpm: rsync-3.2.3-19.el9.src.rpm
21+
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/x86_64/baseos/os/Packages/t/tar-1.34-6.el9_4.1.x86_64.rpm
22+
repoid: rhel-9-for-x86_64-baseos-rpms
23+
size: 910343
24+
checksum: sha256:76f2f5fd1f37153d51a697659db31bd2a672a1a4536b42ce020cf9602ea3cde7
25+
name: tar
26+
evr: 2:1.34-6.el9_4.1
27+
sourcerpm: tar-1.34-6.el9_4.1.src.rpm
2128
source: []
2229
module_metadata: []

.tekton/build-pipeline-must-gather.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ spec:
5151
description: Skip checks against built image
5252
name: skip-checks
5353
type: string
54+
- default: "false"
55+
description: Skip the ecosystem preflight checks (bundles should skip)
56+
name: skip-preflight
57+
type: string
5458
- default: "false"
5559
description: Execute the build with network isolation
5660
name: hermetic
@@ -59,6 +63,10 @@ spec:
5963
description: Build dependencies to be prefetched by Cachi2
6064
name: prefetch-input
6165
type: string
66+
- default: "false"
67+
description: Enable dev-package-manager within prefetching task
68+
name: dev-package-managers
69+
type: string
6270
- default: ""
6371
description: Image tag expiration time, time values could be something like
6472
1h, 2d, 3w for hours, days, and weeks, respectively.
@@ -160,6 +168,8 @@ spec:
160168
value: $(params.output-image).prefetch
161169
- name: ociArtifactExpiresAfter
162170
value: $(params.image-expires-after)
171+
- name: dev-package-managers
172+
value: "true"
163173
runAfter:
164174
- clone-repository
165175
taskRef:
@@ -347,6 +357,10 @@ spec:
347357
operator: in
348358
values:
349359
- "false"
360+
- input: $(params.skip-preflight)
361+
operator: in
362+
values:
363+
- "false"
350364
- name: sast-snyk-check
351365
params:
352366
- name: image-digest

.tekton/numaresources-must-gather-4-20-pull-request.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ spec:
4040
value: "true"
4141
- name: hermetic
4242
value: "true"
43+
- name: prefetch-input
44+
value: '[{"type": "rpm", "path": ".konflux/must-gather"}]'
4345
pipelineRef:
4446
name: build-pipeline-must-gather
4547
taskRunTemplate:

.tekton/numaresources-must-gather-4-20-push.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ spec:
3737
value: "true"
3838
- name: hermetic
3939
value: "true"
40+
- name: prefetch-input
41+
value: '[{"type": "rpm", "path": ".konflux/must-gather"}]'
4042
pipelineRef:
4143
name: build-pipeline-must-gather
4244
taskRunTemplate:

0 commit comments

Comments
 (0)