@@ -27,8 +27,8 @@ PARAMS_ENV_PATH="manifests/base/params.env"
27
27
28
28
# This value needs to be updated everytime we deliberately change number of the
29
29
# images we want to have in the `params.env` or `params-latest.env` file.
30
- EXPECTED_NUM_RECORDS=24
31
- EXPECTED_ADDI_RUNTIME_RECORDS=6
30
+ EXPECTED_NUM_RECORDS=44
31
+ EXPECTED_ADDI_RUNTIME_RECORDS=0
32
32
33
33
# Number of attempts for the skopeo tool to gather data from the repository.
34
34
SKOPEO_RETRY=3
@@ -116,92 +116,134 @@ function check_image_variable_matches_name_and_commitref_and_size() {
116
116
odh-workbench-jupyter-minimal-cpu-py311-ubi9-n)
117
117
expected_name=" odh-notebook-jupyter-minimal-ubi9-python-3.11"
118
118
expected_commitref=" main"
119
- expected_build_name=" jupyter-minimal-ubi9-python-3.11-amd64 "
120
- expected_img_size=624
119
+ expected_build_name=" konflux "
120
+ expected_img_size=1217
121
121
;;
122
122
odh-workbench-jupyter-minimal-cpu-py311-ubi9-n-1)
123
123
expected_name=" odh-notebook-jupyter-minimal-ubi9-python-3.11"
124
124
expected_commitref=" 2024b"
125
125
expected_build_name=" jupyter-minimal-ubi9-python-3.11-amd64"
126
126
expected_img_size=503
127
127
;;
128
+ odh-workbench-jupyter-minimal-cpu-py312-ubi9-n)
129
+ expected_name=" odh-notebook-jupyter-minimal-ubi9-python-3.12"
130
+ expected_commitref=" main"
131
+ expected_build_name=" konflux"
132
+ expected_img_size=1213
133
+ ;;
128
134
odh-workbench-jupyter-minimal-cuda-py311-ubi9-n)
129
135
expected_name=" odh-notebook-jupyter-cuda-minimal-ubi9-python-3.11"
130
136
expected_commitref=" main"
131
- expected_build_name=" cuda-jupyter-minimal-ubi9-python-3.11-amd64 "
132
- expected_img_size=5025
137
+ expected_build_name=" konflux "
138
+ expected_img_size=5624
133
139
;;
134
140
odh-workbench-jupyter-minimal-cuda-py311-ubi9-n-1)
135
141
expected_name=" odh-notebook-jupyter-minimal-ubi9-python-3.11"
136
142
expected_commitref=" 2024b"
137
143
expected_build_name=" cuda-jupyter-minimal-ubi9-python-3.11-amd64"
138
144
expected_img_size=5157
139
145
;;
146
+ odh-workbench-jupyter-minimal-cuda-py312-ubi9-n)
147
+ expected_name=" odh-notebook-jupyter-cuda-minimal-ubi9-python-3.12"
148
+ expected_commitref=" main"
149
+ expected_build_name=" konflux"
150
+ expected_img_size=3370
151
+ ;;
140
152
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n)
141
153
expected_name=" odh-notebook-jupyter-cuda-pytorch-ubi9-python-3.11"
142
154
expected_commitref=" main"
143
- expected_build_name=" cuda-jupyter-pytorch-ubi9-python-3.11-amd64 "
144
- expected_img_size=8571
155
+ expected_build_name=" konflux "
156
+ expected_img_size=9226
145
157
;;
146
158
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n-1)
147
159
expected_name=" odh-notebook-jupyter-pytorch-ubi9-python-3.11"
148
160
expected_commitref=" 2024b"
149
161
expected_build_name=" jupyter-pytorch-ubi9-python-3.11-amd64"
150
162
expected_img_size=8571
151
163
;;
164
+ odh-workbench-jupyter-pytorch-cuda-py312-ubi9-n)
165
+ expected_name=" odh-notebook-jupyter-cuda-pytorch-ubi9-python-3.12"
166
+ expected_commitref=" main"
167
+ expected_build_name=" konflux"
168
+ expected_img_size=6977
169
+ ;;
152
170
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n)
153
171
expected_name=" odh-notebook-jupyter-datascience-ubi9-python-3.11"
154
172
expected_commitref=" main"
155
- expected_build_name=" jupyter-datascience-ubi9-python-3.11-amd64 "
156
- expected_img_size=1067
173
+ expected_build_name=" konflux "
174
+ expected_img_size=1667
157
175
;;
158
176
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n-1)
159
177
expected_name=" odh-notebook-jupyter-datascience-ubi9-python-3.11"
160
178
expected_commitref=" 2024b"
161
179
expected_build_name=" jupyter-datascience-ubi9-python-3.11-amd64"
162
180
expected_img_size=904
163
181
;;
182
+ odh-workbench-jupyter-datascience-cpu-py312-ubi9-n)
183
+ expected_name=" odh-notebook-jupyter-datascience-ubi9-python-3.12"
184
+ expected_commitref=" main"
185
+ expected_build_name=" konflux"
186
+ expected_img_size=1658
187
+ ;;
164
188
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n)
165
189
expected_name=" odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
166
190
expected_commitref=" main"
167
- expected_build_name=" cuda-jupyter-tensorflow-ubi9-python-3.11-amd64 "
168
- expected_img_size=8037
191
+ expected_build_name=" konflux "
192
+ expected_img_size=8652
169
193
;;
170
194
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n-1)
171
195
expected_name=" odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
172
196
expected_commitref=" 2024b"
173
197
expected_build_name=" cuda-jupyter-tensorflow-ubi9-python-3.11-amd64"
174
198
expected_img_size=8211
175
199
;;
200
+ odh-workbench-jupyter-tensorflow-cuda-py312-ubi9-n)
201
+ expected_name=" odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.12"
202
+ expected_commitref=" main"
203
+ expected_build_name=" konflux"
204
+ expected_img_size=6432
205
+ ;;
176
206
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n)
177
207
expected_name=" odh-notebook-jupyter-trustyai-ubi9-python-3.11"
178
208
expected_commitref=" main"
179
- expected_build_name=" jupyter-trustyai-ubi9-python-3.11-amd64 "
180
- expected_img_size=4369
209
+ expected_build_name=" konflux "
210
+ expected_img_size=5015
181
211
;;
182
212
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n-1)
183
213
expected_name=" odh-notebook-jupyter-trustyai-ubi9-python-3.11"
184
214
expected_commitref=" 2024b"
185
215
expected_build_name=" jupyter-trustyai-ubi9-python-3.11-amd64"
186
216
expected_img_size=4197
187
217
;;
218
+ odh-workbench-jupyter-trustyai-cpu-py312-ubi9-n)
219
+ expected_name=" odh-notebook-jupyter-trustyai-ubi9-python-3.12"
220
+ expected_commitref=" main"
221
+ expected_build_name=" konflux"
222
+ expected_img_size=5034
223
+ ;;
188
224
odh-workbench-codeserver-datascience-cpu-py311-ubi9-n)
189
225
expected_name=" odh-notebook-code-server-ubi9-python-3.11"
190
226
expected_commitref=" main"
191
- expected_build_name=" codeserver-ubi9-python-3.11-amd64 "
192
- expected_img_size=893
227
+ expected_build_name=" konflux "
228
+ expected_img_size=979
193
229
;;
194
230
odh-workbench-codeserver-datascience-cpu-py311-ubi9-n-1)
195
231
expected_name=" odh-notebook-code-server-ubi9-python-3.11"
196
232
expected_commitref=" 2024b"
197
233
expected_build_name=" codeserver-ubi9-python-3.11-amd64"
198
234
expected_img_size=850
199
235
;;
236
+ odh-workbench-codeserver-datascience-cpu-py312-ubi9-n)
237
+ expected_name=" odh-notebook-code-server-ubi9-python-3.12"
238
+ expected_commitref=" main"
239
+ expected_build_name=" konflux"
240
+ expected_img_size=971
241
+ ;;
200
242
odh-workbench-rstudio-minimal-cpu-py311-c9s-n)
201
243
expected_name=" odh-notebook-rstudio-server-c9s-python-3.11"
202
244
expected_commitref=" main"
203
245
expected_build_name=" rstudio-c9s-python-3.11-amd64"
204
- expected_img_size=1349
246
+ expected_img_size=1377
205
247
;;
206
248
odh-workbench-rstudio-minimal-cpu-py311-c9s-n-1)
207
249
expected_name=" odh-notebook-rstudio-server-c9s-python-3.11"
@@ -216,7 +258,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
216
258
expected_name=" odh-notebook-rstudio-server-cuda-c9s-python-3.11"
217
259
expected_commitref=" main"
218
260
expected_build_name=" cuda-rstudio-c9s-python-3.11-amd64"
219
- expected_img_size=6473
261
+ expected_img_size=6541
220
262
;;
221
263
odh-workbench-rstudio-minimal-cuda-py311-c9s-n-1)
222
264
expected_name=" odh-notebook-rstudio-server-c9s-python-3.11"
@@ -227,32 +269,44 @@ function check_image_variable_matches_name_and_commitref_and_size() {
227
269
odh-workbench-jupyter-minimal-rocm-py311-ubi9-n)
228
270
expected_name=" odh-notebook-jupyter-rocm-minimal-ubi9-python-3.11"
229
271
expected_commitref=" main"
230
- expected_build_name=" rocm-jupyter-minimal-ubi9-python-3.11-amd64 "
231
- expected_img_size=5891
272
+ expected_build_name=" konflux "
273
+ expected_img_size=6478
232
274
;;
233
275
odh-workbench-jupyter-minimal-rocm-py311-ubi9-n-1)
234
276
expected_name=" odh-notebook-jupyter-minimal-ubi9-python-3.11"
235
277
expected_commitref=" 2024b"
236
278
expected_build_name=" rocm-jupyter-minimal-ubi9-python-3.11-amd64"
237
279
expected_img_size=4830
238
280
;;
281
+ odh-workbench-jupyter-minimal-rocm-py312-ubi9-n)
282
+ expected_name=" odh-notebook-jupyter-rocm-minimal-ubi9-python-3.12"
283
+ expected_commitref=" main"
284
+ expected_build_name=" konflux"
285
+ expected_img_size=6474
286
+ ;;
239
287
odh-workbench-jupyter-pytorch-rocm-py311-ubi9-n)
240
288
expected_name=" odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
241
289
expected_commitref=" main"
242
- expected_build_name=" rocm-jupyter-pytorch-ubi9-python-3.11-amd64 "
243
- expected_img_size=7531
290
+ expected_build_name=" konflux "
291
+ expected_img_size=8135
244
292
;;
245
293
odh-workbench-jupyter-pytorch-rocm-py311-ubi9-n-1)
246
294
expected_name=" odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
247
295
expected_commitref=" 2024b"
248
296
expected_build_name=" rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
249
297
expected_img_size=6571
250
298
;;
299
+ odh-workbench-jupyter-pytorch-rocm-py312-ubi9-n)
300
+ expected_name=" odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.12"
301
+ expected_commitref=" main"
302
+ expected_build_name=" konflux"
303
+ expected_img_size=8124
304
+ ;;
251
305
odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-n)
252
306
expected_name=" odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
253
307
expected_commitref=" main"
254
- expected_build_name=" rocm-jupyter-tensorflow-ubi9-python-3.11-amd64 "
255
- expected_img_size=6828
308
+ expected_build_name=" konflux "
309
+ expected_img_size=7432
256
310
;;
257
311
odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-n-1)
258
312
expected_name=" odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
@@ -264,38 +318,68 @@ function check_image_variable_matches_name_and_commitref_and_size() {
264
318
odh-pipeline-runtime-minimal-cpu-py311-ubi9-n)
265
319
expected_name=" odh-notebook-runtime-minimal-ubi9-python-3.11"
266
320
expected_commitref=" main"
267
- expected_build_name=" runtime-minimal-ubi9-python-3.11-amd64"
268
- expected_img_size=570
321
+ expected_build_name=" konflux"
322
+ expected_img_size=579
323
+ ;;
324
+ odh-pipeline-runtime-minimal-cpu-py312-ubi9-n)
325
+ expected_name=" odh-notebook-runtime-minimal-ubi9-python-3.12"
326
+ expected_commitref=" main"
327
+ expected_build_name=" konflux"
328
+ expected_img_size=579
269
329
;;
270
330
odh-pipeline-runtime-datascience-cpu-py311-ubi9-n)
271
331
expected_name=" odh-notebook-runtime-datascience-ubi9-python-3.11"
272
332
expected_commitref=" main"
273
- expected_build_name=" runtime-datascience-ubi9-python-3.11-amd64"
333
+ expected_build_name=" konflux"
334
+ expected_img_size=964
335
+ ;;
336
+ odh-pipeline-runtime-datascience-cpu-py312-ubi9-n)
337
+ expected_name=" odh-notebook-runtime-datascience-ubi9-python-3.12"
338
+ expected_commitref=" main"
339
+ expected_build_name=" konflux"
274
340
expected_img_size=954
275
341
;;
276
342
odh-pipeline-runtime-pytorch-cuda-py311-ubi9-n)
277
343
expected_name=" odh-notebook-runtime-pytorch-ubi9-python-3.11"
278
344
expected_commitref=" main"
279
- expected_build_name=" runtime-cuda-pytorch-ubi9-python-3.11-amd64"
280
- expected_img_size=8506
345
+ expected_build_name=" konflux"
346
+ expected_img_size=8515
347
+ ;;
348
+ odh-pipeline-runtime-pytorch-cuda-py312-ubi9-n)
349
+ expected_name=" odh-notebook-runtime-pytorch-ubi9-python-3.12"
350
+ expected_commitref=" main"
351
+ expected_build_name=" konflux"
352
+ expected_img_size=6265
281
353
;;
282
354
odh-pipeline-runtime-pytorch-rocm-py311-ubi9-n)
283
355
expected_name=" odh-notebook-runtime-rocm-pytorch-ubi9-python-3.11"
284
356
expected_commitref=" main"
285
- expected_build_name=" rocm-runtime-pytorch-ubi9-python-3.11-amd64"
286
- expected_img_size=7413
357
+ expected_build_name=" konflux"
358
+ expected_img_size=7423
359
+ ;;
360
+ odh-pipeline-runtime-pytorch-rocm-py312-ubi9-n)
361
+ expected_name=" odh-notebook-runtime-rocm-pytorch-ubi9-python-3.12"
362
+ expected_commitref=" main"
363
+ expected_build_name=" konflux"
364
+ expected_img_size=7411
287
365
;;
288
366
odh-pipeline-runtime-tensorflow-cuda-py311-ubi9-n)
289
367
expected_name=" odh-notebook-cuda-runtime-tensorflow-ubi9-python-3.11"
290
368
expected_commitref=" main"
291
- expected_build_name=" runtime-cuda-tensorflow-ubi9-python-3.11-amd64"
292
- expected_img_size=7917
369
+ expected_build_name=" konflux"
370
+ expected_img_size=7938
371
+ ;;
372
+ odh-pipeline-runtime-tensorflow-cuda-py312-ubi9-n)
373
+ expected_name=" odh-notebook-cuda-runtime-tensorflow-ubi9-python-3.12"
374
+ expected_commitref=" main"
375
+ expected_build_name=" konflux"
376
+ expected_img_size=5715
293
377
;;
294
378
odh-pipeline-runtime-tensorflow-rocm-py311-ubi9-n)
295
379
expected_name=" odh-notebook-rocm-runtime-tensorflow-ubi9-python-3.11"
296
380
expected_commitref=" main"
297
- expected_build_name=" rocm-runtime-tensorflow-ubi9-python-3.11-amd64 "
298
- expected_img_size=6705
381
+ expected_build_name=" konflux "
382
+ expected_img_size=6714
299
383
;;
300
384
* )
301
385
echo " Unimplemented variable name: '${image_variable} '"
@@ -407,8 +491,8 @@ function check_image() {
407
491
}
408
492
image_commit_id=$( echo " ${image_metadata_config} " | jq --exit-status --raw-output ' .config.Labels."io.openshift.build.commit.id"' ) || {
409
493
echo " Couldn't parse '.config.Labels." io.openshift.build.commit.id" ' from image metadata, maybe this is a Konflux build?"
410
- image_commit_id=$( echo " ${image_metadata_config} " | jq --exit-status --raw-output ' .config.Labels."git.commit "' ) || {
411
- echo " Couldn't parse '.config.Labels." git.commit " ' from image metadata!"
494
+ image_commit_id=$( echo " ${image_metadata_config} " | jq --exit-status --raw-output ' .config.Labels."vcs-ref "' ) || {
495
+ echo " Couldn't parse '.config.Labels." vcs-ref " ' from image metadata!"
412
496
return 1
413
497
}
414
498
}
0 commit comments