Skip to content

Commit 30eaf29

Browse files
chroinfinityrakshithakamath94
authored andcommitted
hermetic build and fixing violations
Signed-off-by: Hector Delgado <[email protected]>
1 parent 03761c8 commit 30eaf29

File tree

2 files changed

+58
-52
lines changed

2 files changed

+58
-52
lines changed

.tekton/haproxy-7-1-pull-request.yaml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ spec:
8686
description: Execute the build with network isolation
8787
name: hermetic
8888
type: string
89-
- default: ""
89+
- default: '{"type": "rpm", "path": "."}'
9090
description: Build dependencies to be prefetched by Cachi2
9191
name: prefetch-input
9292
type: string
93-
- default: '{"type": "rpm", "path": "."}'
93+
- default: ""
9494
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9595
name: image-expires-after
9696
type: string
@@ -150,7 +150,7 @@ spec:
150150
- name: name
151151
value: init
152152
- name: bundle
153-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:1d8221c84f91b923d89de50bf16481ea729e3b68ea04a9a7cbe8485ddbb27ee6
153+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
154154
- name: kind
155155
value: task
156156
resolver: bundles
@@ -171,7 +171,7 @@ spec:
171171
- name: name
172172
value: git-clone-oci-ta
173173
- name: bundle
174-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d35e5d501cb5f5f88369511f76249857cb5ac30250e1dcf086939321964ff6b9
174+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:bb2f8f1edec47faa08c1929f2ffc6748f3a96af9644e6c40000081c6ff3ec894
175175
- name: kind
176176
value: task
177177
resolver: bundles
@@ -200,7 +200,7 @@ spec:
200200
- name: name
201201
value: prefetch-dependencies-oci-ta
202202
- name: bundle
203-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:092491ac0f6e1009d10c58a1319d1029371bf637cc1293cceba53c6da5314ed1
203+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:0503f9313dfe70e4defda88a7226ec91a74af42198dccfa3280397d965aa16d6
204204
- name: kind
205205
value: task
206206
resolver: bundles
@@ -243,14 +243,16 @@ spec:
243243
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
244244
- name: IMAGE_APPEND_PLATFORM
245245
value: "true"
246+
- name: BUILDAH_FORMAT
247+
value: $(params.buildah-format)
246248
runAfter:
247249
- prefetch-dependencies
248250
taskRef:
249251
params:
250252
- name: name
251253
value: buildah-remote-oci-ta
252254
- name: bundle
253-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:9e866d4d0489a6ab84ae263db416c9f86d2d6117ef4444f495a0e97388ae3ac0
255+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.6@sha256:3832edaec1aae546c225c86ada53611e42717c784e2068e0536831a99cb1922d
254256
- name: kind
255257
value: task
256258
resolver: bundles
@@ -272,14 +274,16 @@ spec:
272274
- name: IMAGES
273275
value:
274276
- $(tasks.build-images.results.IMAGE_REF[*])
277+
- name: BUILDAH_FORMAT
278+
value: $(params.buildah-format)
275279
runAfter:
276280
- build-images
277281
taskRef:
278282
params:
279283
- name: name
280284
value: build-image-index
281285
- name: bundle
282-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3499772af90aad0d3935629be6d37dd9292195fb629e6f43ec839c7f545a0faa
286+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:d94cad7f41be61074dd21c7dff26dab9217c3435a16f62813c1cb8382dd9aae6
283287
- name: kind
284288
value: task
285289
resolver: bundles
@@ -305,7 +309,7 @@ spec:
305309
- name: name
306310
value: source-build-oci-ta
307311
- name: bundle
308-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b1eb49583b41872b27356fee20d5f0eb6ff7f5cdeacde7ffb39655f031104728
312+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:5f9069a07a6dc16aae7a05adf49d2b6792815f3fabd116377578860743f4e0ec
309313
- name: kind
310314
value: task
311315
resolver: bundles
@@ -331,7 +335,7 @@ spec:
331335
- name: name
332336
value: deprecated-image-check
333337
- name: bundle
334-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:3c8b81fa868e27c6266e7660a4bfb4c822846dcf4304606e71e20893b0d3e515
338+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
335339
- name: kind
336340
value: task
337341
resolver: bundles
@@ -353,7 +357,7 @@ spec:
353357
- name: name
354358
value: clair-scan
355359
- name: bundle
356-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:417f44117f8d87a4a62fea6589b5746612ac61640b454dbd88f74892380411f2
360+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
357361
- name: kind
358362
value: task
359363
resolver: bundles
@@ -373,7 +377,7 @@ spec:
373377
- name: name
374378
value: ecosystem-cert-preflight-checks
375379
- name: bundle
376-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:f99d2bdb02f13223d494077a2cde31418d09369f33c02134a8e7e5fad2f61eda
380+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
377381
- name: kind
378382
value: task
379383
resolver: bundles
@@ -399,7 +403,7 @@ spec:
399403
- name: name
400404
value: sast-snyk-check-oci-ta
401405
- name: bundle
402-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:fe5e5ba3a72632cd505910de2eacd62c9d11ed570c325173188f8d568ac60771
406+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:60f2dac41844d222086ff7f477e51f3563716b183d87db89f603d6f604c21760
403407
- name: kind
404408
value: task
405409
resolver: bundles
@@ -421,7 +425,7 @@ spec:
421425
- name: name
422426
value: clamav-scan
423427
- name: bundle
424-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:7749146f7e4fe530846f1b15c9366178ec9f44776ef1922a60d3e7e2b8c6426b
428+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
425429
- name: kind
426430
value: task
427431
resolver: bundles
@@ -466,7 +470,7 @@ spec:
466470
- name: name
467471
value: sast-coverity-check-oci-ta
468472
- name: bundle
469-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:f9ca942208dc2e63b479384ccc56a611cc793397ecc837637b5b9f89c2ecbefe
473+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:ae62d14c999fd93246fef4e57d28570fa5200c3266b9a3263a39965e5a5b02d7
470474
- name: kind
471475
value: task
472476
resolver: bundles
@@ -487,7 +491,7 @@ spec:
487491
- name: name
488492
value: coverity-availability-check
489493
- name: bundle
490-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:db2b267dc15e4ed17f704ee91b8e9b38068e1a35b1018a328fdca621819d74c6
494+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:36bcf1531b85c2c7d7b4382bc0a9c61b0501e2e54e84991b11b225bdec0e5928
491495
- name: kind
492496
value: task
493497
resolver: bundles
@@ -513,7 +517,7 @@ spec:
513517
- name: name
514518
value: sast-shell-check-oci-ta
515519
- name: bundle
516-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
520+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1f0fcba24ebc447d9f8a2ea2e8f262fa435d6c523ca6b0346cd67261551fc9ed
517521
- name: kind
518522
value: task
519523
resolver: bundles
@@ -539,7 +543,7 @@ spec:
539543
- name: name
540544
value: sast-unicode-check-oci-ta
541545
- name: bundle
542-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
546+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1833c618170ab9deb8455667f220df8e88d16ccd630a2361366f594e2bdcb712
543547
- name: kind
544548
value: task
545549
resolver: bundles
@@ -566,7 +570,7 @@ spec:
566570
- name: name
567571
value: apply-tags
568572
- name: bundle
569-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:517a51e260c0b59654a9d7b842e1ab07d76bce15ca7ce9c8fd2489a19be6463d
573+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
570574
- name: kind
571575
value: task
572576
resolver: bundles
@@ -589,7 +593,7 @@ spec:
589593
- name: name
590594
value: push-dockerfile-oci-ta
591595
- name: bundle
592-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:8c75c4a747e635e5f3e12266a3bb6e5d3132bf54e37eaa53d505f89897dd8eca
596+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:738e6e2108bee5b50309a37b54bc1adf8433ac63598dbb6830d6cb4ac65d9de6
593597
- name: kind
594598
value: task
595599
resolver: bundles

0 commit comments

Comments
 (0)