Skip to content

Commit 4e17ba3

Browse files
jstouracjstourac
committed
NO-JIRA: add a 'release' label to our images
Let's have a 'release' label in our images we build so that we can easily filter them out. This change includes this update for the: * local build via Makefile * konflux build via .tekton pipeline definitions There is a third place we should update - the openshift-ci job definitions.
1 parent a2d91e6 commit 4e17ba3

File tree

44 files changed

+481
-36
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+481
-36
lines changed

‎.tekton/codeserver-ubi9-python-3-11-pull-request.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ spec:
3535
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/codeserver-ubi9-python-3-11:on-pr-{{revision}}'
3636
- name: image-expires-after
3737
value: 5d
38+
- name: image-labels
39+
value:
40+
- release=2025a
3841
- name: build-platforms
3942
value:
4043
- linux/x86_64
@@ -101,6 +104,10 @@ spec:
101104
description: Image tag expiration time, time values could be something like
102105
1h, 2d, 3w for hours, days, and weeks, respectively.
103106
name: image-expires-after
107+
- default: []
108+
description: Array of --labels values ("label=value" strings) for buildah.
109+
name: image-labels
110+
type: array
104111
- default: "false"
105112
description: Build a source image.
106113
name: build-source-image
@@ -228,6 +235,9 @@ spec:
228235
value: $(params.prefetch-input)
229236
- name: IMAGE_EXPIRES_AFTER
230237
value: $(params.image-expires-after)
238+
- name: LABELS
239+
value:
240+
- $(params.image-labels[*])
231241
- name: COMMIT_SHA
232242
value: $(tasks.clone-repository.results.commit)
233243
- name: BUILD_ARGS

‎.tekton/codeserver-ubi9-python-3-11-push.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/codeserver-ubi9-python-3-11:{{revision}}'
3030
- name: image-expires-after
3131
value: 28d
32+
- name: image-labels
33+
value:
34+
- release=2025a
3235
- name: build-platforms
3336
value:
3437
- linux/x86_64
@@ -95,6 +98,10 @@ spec:
9598
description: Image tag expiration time, time values could be something like
9699
1h, 2d, 3w for hours, days, and weeks, respectively.
97100
name: image-expires-after
101+
- default: []
102+
description: Array of --labels values ("label=value" strings) for buildah.
103+
name: image-labels
104+
type: array
98105
- default: "false"
99106
description: Build a source image.
100107
name: build-source-image
@@ -222,6 +229,9 @@ spec:
222229
value: $(params.prefetch-input)
223230
- name: IMAGE_EXPIRES_AFTER
224231
value: $(params.image-expires-after)
232+
- name: LABELS
233+
value:
234+
- $(params.image-labels[*])
225235
- name: COMMIT_SHA
226236
value: $(tasks.clone-repository.results.commit)
227237
- name: BUILD_ARGS

‎.tekton/cuda-jupyter-minimal-ubi9-python-3-11-pull-request.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ spec:
3333
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-jupyter-minimal-ubi9-python-3-11:on-pr-{{revision}}'
3434
- name: image-expires-after
3535
value: 5d
36+
- name: image-labels
37+
value:
38+
- release=2025a
3639
- name: build-platforms
3740
value:
3841
- linux/x86_64
@@ -99,6 +102,10 @@ spec:
99102
description: Image tag expiration time, time values could be something like
100103
1h, 2d, 3w for hours, days, and weeks, respectively.
101104
name: image-expires-after
105+
- default: []
106+
description: Array of --labels values ("label=value" strings) for buildah.
107+
name: image-labels
108+
type: array
102109
- default: "false"
103110
description: Build a source image.
104111
name: build-source-image
@@ -226,6 +233,9 @@ spec:
226233
value: $(params.prefetch-input)
227234
- name: IMAGE_EXPIRES_AFTER
228235
value: $(params.image-expires-after)
236+
- name: LABELS
237+
value:
238+
- $(params.image-labels[*])
229239
- name: COMMIT_SHA
230240
value: $(tasks.clone-repository.results.commit)
231241
- name: BUILD_ARGS

‎.tekton/cuda-jupyter-minimal-ubi9-python-3-11-push.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-jupyter-minimal-ubi9-python-3-11:{{revision}}'
3030
- name: image-expires-after
3131
value: 28d
32+
- name: image-labels
33+
value:
34+
- release=2025a
3235
- name: build-platforms
3336
value:
3437
- linux/x86_64
@@ -95,6 +98,10 @@ spec:
9598
description: Image tag expiration time, time values could be something like
9699
1h, 2d, 3w for hours, days, and weeks, respectively.
97100
name: image-expires-after
101+
- default: []
102+
description: Array of --labels values ("label=value" strings) for buildah.
103+
name: image-labels
104+
type: array
98105
- default: "false"
99106
description: Build a source image.
100107
name: build-source-image
@@ -222,6 +229,9 @@ spec:
222229
value: $(params.prefetch-input)
223230
- name: IMAGE_EXPIRES_AFTER
224231
value: $(params.image-expires-after)
232+
- name: LABELS
233+
value:
234+
- $(params.image-labels[*])
225235
- name: COMMIT_SHA
226236
value: $(tasks.clone-repository.results.commit)
227237
- name: BUILD_ARGS

‎.tekton/cuda-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ spec:
3636
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-jupyter-pytorch-ubi9-python-3-11:on-pr-{{revision}}'
3737
- name: image-expires-after
3838
value: 5d
39+
- name: image-labels
40+
value:
41+
- release=2025a
3942
- name: build-platforms
4043
value:
4144
- linux/x86_64
@@ -102,6 +105,10 @@ spec:
102105
description: Image tag expiration time, time values could be something like
103106
1h, 2d, 3w for hours, days, and weeks, respectively.
104107
name: image-expires-after
108+
- default: []
109+
description: Array of --labels values ("label=value" strings) for buildah.
110+
name: image-labels
111+
type: array
105112
- default: "false"
106113
description: Build a source image.
107114
name: build-source-image
@@ -229,6 +236,9 @@ spec:
229236
value: $(params.prefetch-input)
230237
- name: IMAGE_EXPIRES_AFTER
231238
value: $(params.image-expires-after)
239+
- name: LABELS
240+
value:
241+
- $(params.image-labels[*])
232242
- name: COMMIT_SHA
233243
value: $(tasks.clone-repository.results.commit)
234244
- name: BUILD_ARGS

‎.tekton/cuda-jupyter-pytorch-ubi9-python-3-11-push.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-jupyter-pytorch-ubi9-python-3-11:{{revision}}'
3030
- name: image-expires-after
3131
value: 28d
32+
- name: image-labels
33+
value:
34+
- release=2025a
3235
- name: build-platforms
3336
value:
3437
- linux/x86_64
@@ -95,6 +98,10 @@ spec:
9598
description: Image tag expiration time, time values could be something like
9699
1h, 2d, 3w for hours, days, and weeks, respectively.
97100
name: image-expires-after
101+
- default: []
102+
description: Array of --labels values ("label=value" strings) for buildah.
103+
name: image-labels
104+
type: array
98105
- default: "false"
99106
description: Build a source image.
100107
name: build-source-image
@@ -222,6 +229,9 @@ spec:
222229
value: $(params.prefetch-input)
223230
- name: IMAGE_EXPIRES_AFTER
224231
value: $(params.image-expires-after)
232+
- name: LABELS
233+
value:
234+
- $(params.image-labels[*])
225235
- name: COMMIT_SHA
226236
value: $(tasks.clone-repository.results.commit)
227237
- name: BUILD_ARGS

‎.tekton/cuda-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ spec:
3636
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-jupyter-tensorflow-ubi9-python-3-11:on-pr-{{revision}}'
3737
- name: image-expires-after
3838
value: 5d
39+
- name: image-labels
40+
value:
41+
- release=2025a
3942
- name: build-platforms
4043
value:
4144
- linux/x86_64
@@ -102,6 +105,10 @@ spec:
102105
description: Image tag expiration time, time values could be something like
103106
1h, 2d, 3w for hours, days, and weeks, respectively.
104107
name: image-expires-after
108+
- default: []
109+
description: Array of --labels values ("label=value" strings) for buildah.
110+
name: image-labels
111+
type: array
105112
- default: "false"
106113
description: Build a source image.
107114
name: build-source-image
@@ -229,6 +236,9 @@ spec:
229236
value: $(params.prefetch-input)
230237
- name: IMAGE_EXPIRES_AFTER
231238
value: $(params.image-expires-after)
239+
- name: LABELS
240+
value:
241+
- $(params.image-labels[*])
232242
- name: COMMIT_SHA
233243
value: $(tasks.clone-repository.results.commit)
234244
- name: BUILD_ARGS

‎.tekton/cuda-jupyter-tensorflow-ubi9-python-3-11-push.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-jupyter-tensorflow-ubi9-python-3-11:{{revision}}'
3030
- name: image-expires-after
3131
value: 28d
32+
- name: image-labels
33+
value:
34+
- release=2025a
3235
- name: build-platforms
3336
value:
3437
- linux/x86_64
@@ -95,6 +98,10 @@ spec:
9598
description: Image tag expiration time, time values could be something like
9699
1h, 2d, 3w for hours, days, and weeks, respectively.
97100
name: image-expires-after
101+
- default: []
102+
description: Array of --labels values ("label=value" strings) for buildah.
103+
name: image-labels
104+
type: array
98105
- default: "false"
99106
description: Build a source image.
100107
name: build-source-image
@@ -222,6 +229,9 @@ spec:
222229
value: $(params.prefetch-input)
223230
- name: IMAGE_EXPIRES_AFTER
224231
value: $(params.image-expires-after)
232+
- name: LABELS
233+
value:
234+
- $(params.image-labels[*])
225235
- name: COMMIT_SHA
226236
value: $(tasks.clone-repository.results.commit)
227237
- name: BUILD_ARGS

‎.tekton/cuda-rstudio-c9s-python-3-11-pull-request.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ spec:
3838
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-rstudio-c9s-python-3-11:on-pr-{{revision}}'
3939
- name: image-expires-after
4040
value: 5d
41+
- name: image-labels
42+
value:
43+
- release=2025a
4144
- name: build-platforms
4245
value:
4346
- linux/x86_64
@@ -104,6 +107,10 @@ spec:
104107
description: Image tag expiration time, time values could be something like
105108
1h, 2d, 3w for hours, days, and weeks, respectively.
106109
name: image-expires-after
110+
- default: []
111+
description: Array of --labels values ("label=value" strings) for buildah.
112+
name: image-labels
113+
type: array
107114
- default: "false"
108115
description: Build a source image.
109116
name: build-source-image
@@ -231,6 +238,9 @@ spec:
231238
value: $(params.prefetch-input)
232239
- name: IMAGE_EXPIRES_AFTER
233240
value: $(params.image-expires-after)
241+
- name: LABELS
242+
value:
243+
- $(params.image-labels[*])
234244
- name: COMMIT_SHA
235245
value: $(tasks.clone-repository.results.commit)
236246
- name: BUILD_ARGS

‎.tekton/cuda-rstudio-c9s-python-3-11-push.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-rstudio-c9s-python-3-11:{{revision}}'
3030
- name: image-expires-after
3131
value: 28d
32+
- name: image-labels
33+
value:
34+
- release=2025a
3235
- name: build-platforms
3336
value:
3437
- linux/x86_64
@@ -95,6 +98,10 @@ spec:
9598
description: Image tag expiration time, time values could be something like
9699
1h, 2d, 3w for hours, days, and weeks, respectively.
97100
name: image-expires-after
101+
- default: []
102+
description: Array of --labels values ("label=value" strings) for buildah.
103+
name: image-labels
104+
type: array
98105
- default: "false"
99106
description: Build a source image.
100107
name: build-source-image
@@ -222,6 +229,9 @@ spec:
222229
value: $(params.prefetch-input)
223230
- name: IMAGE_EXPIRES_AFTER
224231
value: $(params.image-expires-after)
232+
- name: LABELS
233+
value:
234+
- $(params.image-labels[*])
225235
- name: COMMIT_SHA
226236
value: $(tasks.clone-repository.results.commit)
227237
- name: BUILD_ARGS

‎.tekton/cuda-rstudio-rhel9-python-3-11-pull-request.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ spec:
3838
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-rstudio-rhel9-python-3-11:on-pr-{{revision}}'
3939
- name: image-expires-after
4040
value: 5d
41+
- name: image-labels
42+
value:
43+
- release=2025a
4144
- name: build-platforms
4245
value:
4346
- linux/x86_64
@@ -104,6 +107,10 @@ spec:
104107
description: Image tag expiration time, time values could be something like
105108
1h, 2d, 3w for hours, days, and weeks, respectively.
106109
name: image-expires-after
110+
- default: []
111+
description: Array of --labels values ("label=value" strings) for buildah.
112+
name: image-labels
113+
type: array
107114
- default: "false"
108115
description: Build a source image.
109116
name: build-source-image
@@ -231,6 +238,9 @@ spec:
231238
value: $(params.prefetch-input)
232239
- name: IMAGE_EXPIRES_AFTER
233240
value: $(params.image-expires-after)
241+
- name: LABELS
242+
value:
243+
- $(params.image-labels[*])
234244
- name: COMMIT_SHA
235245
value: $(tasks.clone-repository.results.commit)
236246
- name: BUILD_ARGS

‎.tekton/cuda-rstudio-rhel9-python-3-11-push.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
value: 'quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/cuda-rstudio-rhel9-python-3-11:{{revision}}'
3030
- name: image-expires-after
3131
value: 28d
32+
- name: image-labels
33+
value:
34+
- release=2025a
3235
- name: build-platforms
3336
value:
3437
- linux/x86_64
@@ -95,6 +98,10 @@ spec:
9598
description: Image tag expiration time, time values could be something like
9699
1h, 2d, 3w for hours, days, and weeks, respectively.
97100
name: image-expires-after
101+
- default: []
102+
description: Array of --labels values ("label=value" strings) for buildah.
103+
name: image-labels
104+
type: array
98105
- default: "false"
99106
description: Build a source image.
100107
name: build-source-image
@@ -222,6 +229,9 @@ spec:
222229
value: $(params.prefetch-input)
223230
- name: IMAGE_EXPIRES_AFTER
224231
value: $(params.image-expires-after)
232+
- name: LABELS
233+
value:
234+
- $(params.image-labels[*])
225235
- name: COMMIT_SHA
226236
value: $(tasks.clone-repository.results.commit)
227237
- name: BUILD_ARGS

0 commit comments

Comments
 (0)