Skip to content

Commit d491103

Browse files
Merge pull request #3366 from openshift/konflux/references/master
[master] Update Konflux references to abf231c
2 parents 4428bff + aa4a38e commit d491103

4 files changed

+28
-4
lines changed

.tekton/windows-machine-config-operator-bundle-release-4-21-pull-request.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ spec:
101101
description: Path to a file with build arguments which will be passed to podman during build
102102
name: build-args-file
103103
type: string
104+
- name: buildah-format
105+
default: docker
106+
type: string
107+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
104108
results:
105109
- description: ''
106110
name: IMAGE_URL
@@ -128,7 +132,7 @@ spec:
128132
- name: name
129133
value: init
130134
- name: bundle
131-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
135+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
132136
- name: kind
133137
value: task
134138
resolver: bundles
@@ -207,6 +211,8 @@ spec:
207211
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
208212
- name: CACHI2_ARTIFACT
209213
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
214+
- name: BUILDAH_FORMAT
215+
value: $(params.buildah-format)
210216
runAfter:
211217
- prefetch-dependencies
212218
taskRef:

.tekton/windows-machine-config-operator-bundle-release-4-21-push.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ spec:
9898
description: Path to a file with build arguments which will be passed to podman during build
9999
name: build-args-file
100100
type: string
101+
- name: buildah-format
102+
default: docker
103+
type: string
104+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
101105
results:
102106
- description: ''
103107
name: IMAGE_URL
@@ -125,7 +129,7 @@ spec:
125129
- name: name
126130
value: init
127131
- name: bundle
128-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
132+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
129133
- name: kind
130134
value: task
131135
resolver: bundles
@@ -204,6 +208,8 @@ spec:
204208
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
205209
- name: CACHI2_ARTIFACT
206210
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
211+
- name: BUILDAH_FORMAT
212+
value: $(params.buildah-format)
207213
runAfter:
208214
- prefetch-dependencies
209215
taskRef:

.tekton/windows-machine-config-operator-release-4-21-pull-request.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ spec:
101101
description: Path to a file with build arguments which will be passed to podman during build
102102
name: build-args-file
103103
type: string
104+
- name: buildah-format
105+
default: docker
106+
type: string
107+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
104108
results:
105109
- description: ''
106110
name: IMAGE_URL
@@ -128,7 +132,7 @@ spec:
128132
- name: name
129133
value: init
130134
- name: bundle
131-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
135+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
132136
- name: kind
133137
value: task
134138
resolver: bundles
@@ -207,6 +211,8 @@ spec:
207211
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
208212
- name: CACHI2_ARTIFACT
209213
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
214+
- name: BUILDAH_FORMAT
215+
value: $(params.buildah-format)
210216
runAfter:
211217
- prefetch-dependencies
212218
taskRef:

.tekton/windows-machine-config-operator-release-4-21-push.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ spec:
9898
description: Path to a file with build arguments which will be passed to podman during build
9999
name: build-args-file
100100
type: string
101+
- name: buildah-format
102+
default: docker
103+
type: string
104+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
101105
results:
102106
- description: ''
103107
name: IMAGE_URL
@@ -125,7 +129,7 @@ spec:
125129
- name: name
126130
value: init
127131
- name: bundle
128-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
132+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
129133
- name: kind
130134
value: task
131135
resolver: bundles
@@ -204,6 +208,8 @@ spec:
204208
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
205209
- name: CACHI2_ARTIFACT
206210
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
211+
- name: BUILDAH_FORMAT
212+
value: $(params.buildah-format)
207213
runAfter:
208214
- prefetch-dependencies
209215
taskRef:

0 commit comments

Comments
 (0)