Skip to content

Commit 198e816

Browse files
author
serverless-qe
committed
[release-v1.16] Sync Konflux configurations
1 parent 91b6832 commit 198e816

File tree

2 files changed

+11
-32
lines changed

2 files changed

+11
-32
lines changed

.github/workflows/dependabot-deps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: ${{ github.actor == 'dependabot[bot]' }}
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
with:
1919
ref: ${{ github.head_ref }}
2020
path: ./src/github.com/${{ github.repository }}

.tekton/docker-build.yaml

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp: null
54
labels:
65
pipelines.openshift.io/runtime: generic
76
pipelines.openshift.io/strategy: docker
@@ -59,10 +58,6 @@ spec:
5958
path-context
6059
name: dockerfile
6160
type: string
62-
- default: "false"
63-
description: Force rebuild image
64-
name: rebuild
65-
type: string
6661
- default: "false"
6762
description: Skip checks against built image
6863
name: skip-checks
@@ -89,6 +84,9 @@ spec:
8984
oci or docker.
9085
name: buildah-format
9186
type: string
87+
- default: "false"
88+
description: Enable cache proxy configuration
89+
name: enable-cache-proxy
9290
- default: []
9391
description: Array of --build-arg values ("arg=value" strings) for buildah
9492
name: build-args
@@ -193,12 +191,8 @@ spec:
193191
resolver: bundles
194192
- name: init
195193
params:
196-
- name: image-url
197-
value: $(params.output-image)
198-
- name: rebuild
199-
value: $(params.rebuild)
200-
- name: skip-checks
201-
value: $(params.skip-checks)
194+
- name: enable-cache-proxy
195+
value: $(params.enable-cache-proxy)
202196
taskRef:
203197
params:
204198
- name: name
@@ -229,11 +223,6 @@ spec:
229223
- name: kind
230224
value: task
231225
resolver: bundles
232-
when:
233-
- input: $(tasks.init.results.build)
234-
operator: in
235-
values:
236-
- "true"
237226
workspaces:
238227
- name: basic-auth
239228
workspace: git-auth
@@ -269,6 +258,10 @@ spec:
269258
value: $(tasks.clone-repository.results.url)
270259
- name: BUILDAH_FORMAT
271260
value: $(params.buildah-format)
261+
- name: HTTP_PROXY
262+
value: $(tasks.init.results.http-proxy)
263+
- name: NO_PROXY
264+
value: $(tasks.init.results.no-proxy)
272265
- name: SOURCE_ARTIFACT
273266
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
274267
- name: CACHI2_ARTIFACT
@@ -286,11 +279,6 @@ spec:
286279
- name: kind
287280
value: task
288281
resolver: bundles
289-
when:
290-
- input: $(tasks.init.results.build)
291-
operator: in
292-
values:
293-
- "true"
294282
- name: build-image-index
295283
params:
296284
- name: IMAGE
@@ -317,11 +305,6 @@ spec:
317305
- name: kind
318306
value: task
319307
resolver: bundles
320-
when:
321-
- input: $(tasks.init.results.build)
322-
operator: in
323-
values:
324-
- "true"
325308
- name: build-source-image
326309
params:
327310
- name: BINARY_IMAGE
@@ -344,10 +327,6 @@ spec:
344327
value: task
345328
resolver: bundles
346329
when:
347-
- input: $(tasks.init.results.build)
348-
operator: in
349-
values:
350-
- "true"
351330
- input: $(params.build-source-image)
352331
operator: in
353332
values:
@@ -541,7 +520,7 @@ spec:
541520
- name: name
542521
value: rpms-signature-scan
543522
- name: bundle
544-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:49ff6d117c3e9dc3966d1244e118e168b3501742ec14c3a4161a276ff48d04d5
523+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:47b81d6b3d752649eddfbb8b3fd8f6522c4bb07f6d1946f9bc45dae3f92e2c9a
545524
- name: kind
546525
value: task
547526
resolver: bundles

0 commit comments

Comments
 (0)