Skip to content

Commit 31743d8

Browse files
committed
Add required pipeline customizations
Bring over the customizations we use on top of the default pipeline. (This is manual and potentially error prone, so let's review carefully I guess.) Useful vimdiff commands to review this change: vimdiff +'set ft=yaml' <(git show main:.tekton/cli-build.yaml|yq .spec) <(git show HEAD:.tekton/cli-v06-pull-request.yaml|yq .spec.pipelineSpec) vimdiff +'set ft=yaml' <(git show main:.tekton/cli-build.yaml|yq .spec) <(git show HEAD:.tekton/cli-v06-push.yaml|yq .spec.pipelineSpec) vimdiff +'set ft=yaml' <(git show main:.tekton/cli-main-ci-pull-request.yaml) <(yq '.spec.pipelineSpec = {}' .tekton/cli-v06-pull-request.yaml) vimdiff +'set ft=yaml' <(git show main:.tekton/cli-main-ci-push.yaml) <(yq '.spec.pipelineSpec = {}' .tekton/cli-v06-push.yaml) vimdiff .tekton/cli-v06-push.yaml .tekton/cli-v06-pull-request.yaml Ref: https://issues.redhat.com/browse/EC-1135
1 parent 3cc86d2 commit 31743d8

File tree

2 files changed

+40
-4
lines changed

2 files changed

+40
-4
lines changed

.tekton/cli-v06-pull-request.yaml

+20-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,20 @@ spec:
2525
value: '{{revision}}'
2626
- name: output-image
2727
value: quay.io/redhat-user-workloads/rhtap-contract-tenant/ec-v06/cli-v06:on-pr-{{revision}}
28-
- name: image-expires-after
29-
value: 5d
3028
- name: dockerfile
3129
value: Dockerfile.dist
30+
- name: image-expires-after
31+
value: 5d
32+
- name: path-context
33+
value: .
34+
- name: prefetch-input
35+
value: '[{"type": "gomod"}, {"type": "gomod", "path": "tools/kubectl"}, {"type": "rpm"}]'
36+
- name: build-source-image
37+
value: 'true'
38+
- name: build-args-file
39+
value: quick-build-args.conf
40+
- name: hermetic
41+
value: 'true'
3242
pipelineSpec:
3343
description: |
3444
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -90,6 +100,7 @@ spec:
90100
description: Image tag expiration time, time values could be something like
91101
1h, 2d, 3w for hours, days, and weeks, respectively.
92102
name: image-expires-after
103+
type: string
93104
- default: "false"
94105
description: Build a source image.
95106
name: build-source-image
@@ -147,6 +158,10 @@ spec:
147158
value: $(params.output-image).git
148159
- name: ociArtifactExpiresAfter
149160
value: $(params.image-expires-after)
161+
- name: depth
162+
value: "0"
163+
- name: fetchTags
164+
value: "true"
150165
runAfter:
151166
- init
152167
taskRef:
@@ -176,6 +191,8 @@ spec:
176191
value: $(params.output-image).prefetch
177192
- name: ociArtifactExpiresAfter
178193
value: $(params.image-expires-after)
194+
- name: dev-package-managers
195+
value: "true"
179196
runAfter:
180197
- clone-repository
181198
taskRef:
@@ -212,7 +229,7 @@ spec:
212229
value:
213230
- $(params.build-args[*])
214231
- name: BUILD_ARGS_FILE
215-
value: $(params.build-args-file)
232+
value: "$(params.build-args-file)"
216233
- name: SOURCE_ARTIFACT
217234
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
218235
- name: CACHI2_ARTIFACT

.tekton/cli-v06-push.yaml

+20-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ spec:
2626
value: quay.io/redhat-user-workloads/rhtap-contract-tenant/ec-v06/cli-v06:{{revision}}
2727
- name: dockerfile
2828
value: Dockerfile.dist
29+
- name: image-expires-after
30+
value: ''
31+
- name: path-context
32+
value: .
33+
- name: prefetch-input
34+
value: '[{"type": "gomod"}, {"type": "gomod", "path": "tools/kubectl"}, {"type": "rpm"}]'
35+
- name: build-source-image
36+
value: 'true'
37+
- name: build-args-file
38+
value: ''
39+
- name: hermetic
40+
value: 'true'
2941
pipelineSpec:
3042
description: |
3143
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -87,6 +99,7 @@ spec:
8799
description: Image tag expiration time, time values could be something like
88100
1h, 2d, 3w for hours, days, and weeks, respectively.
89101
name: image-expires-after
102+
type: string
90103
- default: "false"
91104
description: Build a source image.
92105
name: build-source-image
@@ -144,6 +157,10 @@ spec:
144157
value: $(params.output-image).git
145158
- name: ociArtifactExpiresAfter
146159
value: $(params.image-expires-after)
160+
- name: depth
161+
value: "0"
162+
- name: fetchTags
163+
value: "true"
147164
runAfter:
148165
- init
149166
taskRef:
@@ -173,6 +190,8 @@ spec:
173190
value: $(params.output-image).prefetch
174191
- name: ociArtifactExpiresAfter
175192
value: $(params.image-expires-after)
193+
- name: dev-package-managers
194+
value: "true"
176195
runAfter:
177196
- clone-repository
178197
taskRef:
@@ -209,7 +228,7 @@ spec:
209228
value:
210229
- $(params.build-args[*])
211230
- name: BUILD_ARGS_FILE
212-
value: $(params.build-args-file)
231+
value: "$(params.build-args-file)"
213232
- name: SOURCE_ARTIFACT
214233
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
215234
- name: CACHI2_ARTIFACT

0 commit comments

Comments
 (0)