Skip to content

Commit a149477

Browse files
jstouracjstourac
committed
NO-JIRA: chore(ci): fix checks scripts for params.env and runtimes
There are some differences between upstream and downstream repositories that we have to take into account. These changes should fix it and the checks should work just fine in downstream again.
1 parent 901b04c commit a149477

File tree

2 files changed

+33
-11
lines changed

2 files changed

+33
-11
lines changed

‎ci/check-params-env.sh

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,28 +103,31 @@ function check_image_variable_matches_name_and_commitref_and_size() {
103103
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
104104
expected_commitref="release-2024b"
105105
expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
106-
expected_img_size=520
106+
expected_img_size=528
107107
;;
108108
odh-minimal-notebook-image-n-1)
109109
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
110110
expected_commitref="release-2024a"
111111
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
112-
expected_img_size=503
112+
expected_img_size=489
113113
;;
114114
odh-minimal-notebook-image-n-2)
115115
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
116116
expected_commitref="release-2023b"
117117
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
118+
expected_img_size=486
118119
;;
119120
odh-minimal-notebook-image-n-3)
120121
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
121122
expected_commitref="release-2023a"
122123
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
124+
expected_img_size=475
123125
;;
124126
odh-minimal-notebook-image-n-4)
125127
expected_name="odh-notebook-jupyter-minimal-ubi8-python-3.8"
126128
expected_commitref="release-1.2"
127129
expected_build_name="jupyter-minimal-ubi8-python-3.8-amd64"
130+
expected_img_size=479
128131
;;
129132
odh-minimal-gpu-notebook-image-n)
130133
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
@@ -136,22 +139,25 @@ function check_image_variable_matches_name_and_commitref_and_size() {
136139
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
137140
expected_commitref="release-2024a"
138141
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
139-
expected_img_size=5718
142+
expected_img_size=6026
140143
;;
141144
odh-minimal-gpu-notebook-image-n-2)
142145
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
143146
expected_commitref="release-2023b"
144147
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
148+
expected_img_size=5326
145149
;;
146150
odh-minimal-gpu-notebook-image-n-3)
147151
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
148152
expected_commitref="release-2023a"
149153
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
154+
expected_img_size=5038
150155
;;
151156
odh-minimal-gpu-notebook-image-n-4)
152157
expected_name="odh-notebook-jupyter-minimal-ubi8-python-3.8"
153158
expected_commitref="release-1.2"
154159
expected_build_name="cuda-jupyter-minimal-ubi8-python-3.8-amd64"
160+
expected_img_size=5333
155161
;;
156162
odh-pytorch-gpu-notebook-image-n)
157163
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.11"
@@ -163,22 +169,25 @@ function check_image_variable_matches_name_and_commitref_and_size() {
163169
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
164170
expected_commitref="release-2024a"
165171
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
166-
expected_img_size=9037
172+
expected_img_size=9354
167173
;;
168174
odh-pytorch-gpu-notebook-image-n-2)
169175
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
170176
expected_commitref="release-2023b"
171177
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
178+
expected_img_size=8711
172179
;;
173180
odh-pytorch-gpu-notebook-image-n-3)
174181
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
175182
expected_commitref="release-2023a"
176183
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
184+
expected_img_size=7130
177185
;;
178186
odh-pytorch-gpu-notebook-image-n-4)
179187
expected_name="odh-notebook-cuda-jupyter-pytorch-ubi8-python-3.8"
180188
expected_commitref="release-1.2"
181189
expected_build_name="jupyter-pytorch-ubi8-python-3.8-amd64"
190+
expected_img_size=6592
182191
;;
183192
odh-generic-data-science-notebook-image-n)
184193
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
@@ -190,22 +199,25 @@ function check_image_variable_matches_name_and_commitref_and_size() {
190199
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
191200
expected_commitref="release-2024a"
192201
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
193-
expected_img_size=904
202+
expected_img_size=890
194203
;;
195204
odh-generic-data-science-notebook-image-n-2)
196205
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
197206
expected_commitref="release-2023b"
198207
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
208+
expected_img_size=883
199209
;;
200210
odh-generic-data-science-notebook-image-n-3)
201211
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
202212
expected_commitref="release-2023a"
203213
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
214+
expected_img_size=685
204215
;;
205216
odh-generic-data-science-notebook-image-n-4)
206217
expected_name="odh-notebook-jupyter-datascience-ubi8-python-3.8"
207218
expected_commitref="release-1.2"
208219
expected_build_name="jupyter-datascience-ubi8-python-3.8-amd64"
220+
expected_img_size=865
209221
;;
210222
odh-tensorflow-gpu-notebook-image-n)
211223
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
@@ -217,22 +229,25 @@ function check_image_variable_matches_name_and_commitref_and_size() {
217229
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
218230
expected_commitref="release-2024a"
219231
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
220-
expected_img_size=6667
232+
expected_img_size=6984
221233
;;
222234
odh-tensorflow-gpu-notebook-image-n-2)
223235
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
224236
expected_commitref="release-2023b"
225237
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
238+
expected_img_size=6301
226239
;;
227240
odh-tensorflow-gpu-notebook-image-n-3)
228241
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
229242
expected_commitref="release-2023a"
230243
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
244+
expected_img_size=5927
231245
;;
232246
odh-tensorflow-gpu-notebook-image-n-4)
233247
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi8-python-3.8"
234248
expected_commitref="release-1.2"
235249
expected_build_name="cuda-jupyter-tensorflow-ubi8-python-3.8-amd64"
250+
expected_img_size=6309
236251
;;
237252
odh-trustyai-notebook-image-n)
238253
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
@@ -244,17 +259,19 @@ function check_image_variable_matches_name_and_commitref_and_size() {
244259
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
245260
expected_commitref="release-2024a"
246261
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
262+
expected_img_size=1123
247263
;;
248264
odh-trustyai-notebook-image-n-2)
249265
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
250266
expected_commitref="release-2023b"
251267
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
268+
expected_img_size=1057
252269
;;
253270
odh-trustyai-notebook-image-n-3)
254271
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
255272
expected_commitref="release-2023a"
256273
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
257-
expected_img_size=1158
274+
expected_img_size=883
258275
;;
259276
odh-codeserver-notebook-image-n)
260277
expected_name="odh-notebook-code-server-ubi9-python-3.11"
@@ -266,15 +283,16 @@ function check_image_variable_matches_name_and_commitref_and_size() {
266283
expected_name="odh-notebook-code-server-ubi9-python-3.9"
267284
expected_commitref="release-2024a"
268285
expected_build_name="codeserver-ubi9-python-3.9-amd64"
269-
expected_img_size=850
286+
expected_img_size=837
270287
;;
271288
odh-codeserver-notebook-image-n-2)
272289
expected_name="odh-notebook-code-server-ubi9-python-3.9"
273290
expected_commitref="release-2023b"
274291
expected_build_name="codeserver-ubi9-python-3.9-amd64"
292+
expected_img_size=778
275293
;;
276294
odh-rocm-minimal-notebook-image-n)
277-
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
295+
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
278296
expected_commitref="release-2024b"
279297
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
280298
expected_img_size=4830

‎ci/check-runtime-images.sh

Lines changed: 6 additions & 2 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="release-2024b"
2323

2424
# Size change tresholds:
2525
# Max percentual change
@@ -163,7 +163,11 @@ function main() {
163163
ret_code=0
164164

165165
# If name of the directory isn't good enough, maybe we can improve this to search for the: `"schema_name": "runtime-image"` string.
166-
runtime_image_files=$(find . -name "*.json" | grep "runtime-images" | sort --unique)
166+
runtime_image_files_all=$(find . -name "*.json" | grep "runtime-images" | sort --unique)
167+
168+
# TODO: for now let's exclude runtime images for 2024a branch.
169+
# We shall consider whether we want to include check of these (N-1) in the future, but probably not.
170+
runtime_image_files=$(echo "${runtime_image_files_all}" | grep -v "python-3.9")
167171

168172
IFS=$'\n'
169173
for file in ${runtime_image_files}; do

0 commit comments

Comments
 (0)