Skip to content

Commit bdfd827

Browse files
authored
chore(check-params): update 3.12 image names and sizes for built images (#1336)
1 parent b695fb0 commit bdfd827

File tree

1 file changed

+121
-37
lines changed

1 file changed

+121
-37
lines changed

ci/check-params-env.sh

Lines changed: 121 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ PARAMS_ENV_PATH="manifests/base/params.env"
2727

2828
# This value needs to be updated everytime we deliberately change number of the
2929
# 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
3232

3333
# Number of attempts for the skopeo tool to gather data from the repository.
3434
SKOPEO_RETRY=3
@@ -116,92 +116,134 @@ function check_image_variable_matches_name_and_commitref_and_size() {
116116
odh-workbench-jupyter-minimal-cpu-py311-ubi9-n)
117117
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
118118
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
121121
;;
122122
odh-workbench-jupyter-minimal-cpu-py311-ubi9-n-1)
123123
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
124124
expected_commitref="2024b"
125125
expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
126126
expected_img_size=503
127127
;;
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+
;;
128134
odh-workbench-jupyter-minimal-cuda-py311-ubi9-n)
129135
expected_name="odh-notebook-jupyter-cuda-minimal-ubi9-python-3.11"
130136
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
133139
;;
134140
odh-workbench-jupyter-minimal-cuda-py311-ubi9-n-1)
135141
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
136142
expected_commitref="2024b"
137143
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.11-amd64"
138144
expected_img_size=5157
139145
;;
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+
;;
140152
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n)
141153
expected_name="odh-notebook-jupyter-cuda-pytorch-ubi9-python-3.11"
142154
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
145157
;;
146158
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n-1)
147159
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.11"
148160
expected_commitref="2024b"
149161
expected_build_name="jupyter-pytorch-ubi9-python-3.11-amd64"
150162
expected_img_size=8571
151163
;;
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+
;;
152170
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n)
153171
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
154172
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
157175
;;
158176
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n-1)
159177
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
160178
expected_commitref="2024b"
161179
expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
162180
expected_img_size=904
163181
;;
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+
;;
164188
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n)
165189
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
166190
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
169193
;;
170194
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n-1)
171195
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
172196
expected_commitref="2024b"
173197
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.11-amd64"
174198
expected_img_size=8211
175199
;;
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+
;;
176206
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n)
177207
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
178208
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
181211
;;
182212
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n-1)
183213
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
184214
expected_commitref="2024b"
185215
expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
186216
expected_img_size=4197
187217
;;
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+
;;
188224
odh-workbench-codeserver-datascience-cpu-py311-ubi9-n)
189225
expected_name="odh-notebook-code-server-ubi9-python-3.11"
190226
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
193229
;;
194230
odh-workbench-codeserver-datascience-cpu-py311-ubi9-n-1)
195231
expected_name="odh-notebook-code-server-ubi9-python-3.11"
196232
expected_commitref="2024b"
197233
expected_build_name="codeserver-ubi9-python-3.11-amd64"
198234
expected_img_size=850
199235
;;
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+
;;
200242
odh-workbench-rstudio-minimal-cpu-py311-c9s-n)
201243
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
202244
expected_commitref="main"
203245
expected_build_name="rstudio-c9s-python-3.11-amd64"
204-
expected_img_size=1349
246+
expected_img_size=1377
205247
;;
206248
odh-workbench-rstudio-minimal-cpu-py311-c9s-n-1)
207249
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
@@ -216,7 +258,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
216258
expected_name="odh-notebook-rstudio-server-cuda-c9s-python-3.11"
217259
expected_commitref="main"
218260
expected_build_name="cuda-rstudio-c9s-python-3.11-amd64"
219-
expected_img_size=6473
261+
expected_img_size=6541
220262
;;
221263
odh-workbench-rstudio-minimal-cuda-py311-c9s-n-1)
222264
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
@@ -227,32 +269,44 @@ function check_image_variable_matches_name_and_commitref_and_size() {
227269
odh-workbench-jupyter-minimal-rocm-py311-ubi9-n)
228270
expected_name="odh-notebook-jupyter-rocm-minimal-ubi9-python-3.11"
229271
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
232274
;;
233275
odh-workbench-jupyter-minimal-rocm-py311-ubi9-n-1)
234276
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
235277
expected_commitref="2024b"
236278
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
237279
expected_img_size=4830
238280
;;
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+
;;
239287
odh-workbench-jupyter-pytorch-rocm-py311-ubi9-n)
240288
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
241289
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
244292
;;
245293
odh-workbench-jupyter-pytorch-rocm-py311-ubi9-n-1)
246294
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
247295
expected_commitref="2024b"
248296
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
249297
expected_img_size=6571
250298
;;
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+
;;
251305
odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-n)
252306
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
253307
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
256310
;;
257311
odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-n-1)
258312
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() {
264318
odh-pipeline-runtime-minimal-cpu-py311-ubi9-n)
265319
expected_name="odh-notebook-runtime-minimal-ubi9-python-3.11"
266320
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
269329
;;
270330
odh-pipeline-runtime-datascience-cpu-py311-ubi9-n)
271331
expected_name="odh-notebook-runtime-datascience-ubi9-python-3.11"
272332
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"
274340
expected_img_size=954
275341
;;
276342
odh-pipeline-runtime-pytorch-cuda-py311-ubi9-n)
277343
expected_name="odh-notebook-runtime-pytorch-ubi9-python-3.11"
278344
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
281353
;;
282354
odh-pipeline-runtime-pytorch-rocm-py311-ubi9-n)
283355
expected_name="odh-notebook-runtime-rocm-pytorch-ubi9-python-3.11"
284356
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
287365
;;
288366
odh-pipeline-runtime-tensorflow-cuda-py311-ubi9-n)
289367
expected_name="odh-notebook-cuda-runtime-tensorflow-ubi9-python-3.11"
290368
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
293377
;;
294378
odh-pipeline-runtime-tensorflow-rocm-py311-ubi9-n)
295379
expected_name="odh-notebook-rocm-runtime-tensorflow-ubi9-python-3.11"
296380
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
299383
;;
300384
*)
301385
echo "Unimplemented variable name: '${image_variable}'"
@@ -407,8 +491,8 @@ function check_image() {
407491
}
408492
image_commit_id=$(echo "${image_metadata_config}" | jq --exit-status --raw-output '.config.Labels."io.openshift.build.commit.id"') || {
409493
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!"
412496
return 1
413497
}
414498
}

0 commit comments

Comments
 (0)