Skip to content

Commit 21a77ad

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1000 from jstourac/updateExpectedImageSize
NO-ISSUE: chore(GHA): update expected image size for 2025.1 version
2 parents eb02342 + 05b6fba commit 21a77ad

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

‎ci/check-params-env.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
106106
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
107107
expected_commitref="main"
108108
expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
109-
expected_img_size=520
109+
expected_img_size=624
110110
;;
111111
odh-minimal-notebook-image-n-1)
112112
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
@@ -118,7 +118,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
118118
expected_name="odh-notebook-jupyter-cuda-minimal-ubi9-python-3.11"
119119
expected_commitref="main"
120120
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.11-amd64"
121-
expected_img_size=5157
121+
expected_img_size=5025
122122
;;
123123
odh-minimal-gpu-notebook-image-n-1)
124124
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
@@ -142,7 +142,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
142142
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
143143
expected_commitref="main"
144144
expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
145-
expected_img_size=961
145+
expected_img_size=1067
146146
;;
147147
odh-generic-data-science-notebook-image-n-1)
148148
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
@@ -154,7 +154,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
154154
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
155155
expected_commitref="main"
156156
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.11-amd64"
157-
expected_img_size=8211
157+
expected_img_size=8037
158158
;;
159159
odh-tensorflow-gpu-notebook-image-n-1)
160160
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
@@ -166,7 +166,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
166166
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
167167
expected_commitref="main"
168168
expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
169-
expected_img_size=4197
169+
expected_img_size=4369
170170
;;
171171
odh-trustyai-notebook-image-n-1)
172172
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
@@ -190,7 +190,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
190190
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
191191
expected_commitref="main"
192192
expected_build_name="rstudio-c9s-python-3.11-amd64"
193-
expected_img_size=1242
193+
expected_img_size=1349
194194
;;
195195
odh-rstudio-notebook-image-n-1)
196196
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
@@ -205,7 +205,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
205205
expected_name="odh-notebook-rstudio-server-cuda-c9s-python-3.11"
206206
expected_commitref="main"
207207
expected_build_name="cuda-rstudio-c9s-python-3.11-amd64"
208-
expected_img_size=7184
208+
expected_img_size=6473
209209
;;
210210
odh-rstudio-gpu-notebook-image-n-1)
211211
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
@@ -217,7 +217,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
217217
expected_name="odh-notebook-jupyter-rocm-minimal-ubi9-python-3.11"
218218
expected_commitref="main"
219219
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
220-
expected_img_size=4830
220+
expected_img_size=5891
221221
;;
222222
odh-rocm-minimal-notebook-image-n-1)
223223
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
@@ -229,7 +229,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
229229
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
230230
expected_commitref="main"
231231
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
232-
expected_img_size=6571
232+
expected_img_size=7531
233233
;;
234234
odh-rocm-pytorch-notebook-image-n-1)
235235
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
@@ -241,7 +241,7 @@ function check_image_variable_matches_name_and_commitref_and_size() {
241241
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
242242
expected_commitref="main"
243243
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.11-amd64"
244-
expected_img_size=5782
244+
expected_img_size=6828
245245
;;
246246
odh-rocm-tensorflow-notebook-image-n-1)
247247
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"

‎ci/check-runtime-images.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# ---------------------------- DEFINED FUNCTIONS ----------------------------- #
2020

2121
# Expected commit reference for the runtime images
22-
EXPECTED_COMMIT_REF="2024b"
22+
EXPECTED_COMMIT_REF="main"
2323

2424
# Number of attempts for the skopeo tool to gather data from the repository.
2525
SKOPEO_RETRY=3
@@ -38,22 +38,22 @@ function check_image_size() {
3838

3939
case "${img_name}" in
4040
odh-notebook-runtime-datascience-ubi9-python-3.11)
41-
expected_img_size=866
41+
expected_img_size=973
4242
;;
4343
odh-notebook-runtime-pytorch-ubi9-python-3.11)
44-
expected_img_size=3829
44+
expected_img_size=8530
4545
;;
4646
odh-notebook-runtime-rocm-pytorch-ubi9-python-3.11)
47-
expected_img_size=6477
47+
expected_img_size=7439
4848
;;
4949
odh-notebook-rocm-runtime-tensorflow-ubi9-python-3.11)
50-
expected_img_size=5660
50+
expected_img_size=6731
5151
;;
5252
odh-notebook-cuda-runtime-tensorflow-ubi9-python-3.11)
5353
expected_img_size=7992
5454
;;
5555
odh-notebook-runtime-minimal-ubi9-python-3.11)
56-
expected_img_size=494
56+
expected_img_size=589
5757
;;
5858
*)
5959
echo "Unimplemented image name: '${img_name}'"
@@ -131,6 +131,11 @@ function check_image() {
131131
echo "Image name: '${img_name}'"
132132

133133
local expected_string="runtime-${img_tag}-ubi"
134+
# workaround as we have a mismatch in the naming in the dockerfile:
135+
# https://github.com/opendatahub-io/notebooks/blob/6d0d410abfcf91b42962acce15fe2c80d056912d/runtimes/rocm-tensorflow/ubi9-python-3.11/Dockerfile.rocm#L67
136+
if test "${expected_string}" == "runtime-rocm-tensorflow-ubi"; then
137+
expected_string="rocm-runtime-tensorflow-ubi"
138+
fi
134139
echo "Checking that '${expected_string}' is present in the image metadata"
135140
echo "${img_metadata_config}" | grep --quiet "${expected_string}" || {
136141
echo "ERROR: The string '${expected_string}' isn't present in the image metadata at all. Please check that the referenced image '${img_url}' is the correct one!"

0 commit comments

Comments
 (0)