Skip to content

Commit 166b9d9

Browse files
jstouracjstourac
committed
Fix all the kustomization IDs with respect to recent changes
This includes also fix for the check-params-env.sh CI script.
1 parent 7cf1654 commit 166b9d9

13 files changed

+269
-294
lines changed

‎.github/workflows/params-env.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ jobs:
2727
- name: Validate the 'manifests/base/params.env' file content
2828
run: |
2929
bash ./ci/check-params-env.sh
30-

‎ci/check-params-env.sh

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function check_variables_uniq() {
4747
local allow_value_duplicity="${3:=false}"
4848
local is_params_env="${4:=false}"
4949
local ret_code=0
50-
50+
5151

5252
echo "Checking that all variables in the file '${env_file_path_1}' & '${env_file_path_2}' are unique and expected"
5353

@@ -125,25 +125,25 @@ function check_image_variable_matches_name_and_commitref_and_size() {
125125
expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
126126
expected_img_size=528
127127
;;
128-
odh-minimal-notebook-image-n-2)
128+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-n-2)
129129
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
130130
expected_commitref="release-2024a"
131131
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
132132
expected_img_size=489
133133
;;
134-
odh-minimal-notebook-image-n-3)
134+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-n-3)
135135
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
136136
expected_commitref="release-2023b"
137137
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
138138
expected_img_size=486
139139
;;
140-
odh-minimal-notebook-image-n-4)
140+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-n-4)
141141
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
142142
expected_commitref="release-2023a"
143143
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
144144
expected_img_size=475
145145
;;
146-
odh-minimal-notebook-image-n-5)
146+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-n-5)
147147
expected_name="odh-notebook-jupyter-minimal-ubi8-python-3.8"
148148
expected_commitref="release-1.2"
149149
expected_build_name="jupyter-minimal-ubi8-python-3.8-amd64"
@@ -161,31 +161,31 @@ function check_image_variable_matches_name_and_commitref_and_size() {
161161
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.11-amd64"
162162
expected_img_size=5157
163163
;;
164-
odh-minimal-gpu-notebook-image-n-2)
164+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-n-2)
165165
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
166166
expected_commitref="release-2024a"
167167
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
168168
expected_img_size=6026
169169
;;
170-
odh-minimal-gpu-notebook-image-n-3)
170+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-n-3)
171171
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
172172
expected_commitref="release-2023b"
173173
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
174174
expected_img_size=5326
175175
;;
176-
odh-minimal-gpu-notebook-image-n-4)
176+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-n-4)
177177
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
178178
expected_commitref="release-2023a"
179179
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
180180
expected_img_size=5038
181181
;;
182-
odh-minimal-gpu-notebook-image-n-5)
182+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-n-5)
183183
expected_name="odh-notebook-jupyter-minimal-ubi8-python-3.8"
184184
expected_commitref="release-1.2"
185185
expected_build_name="cuda-jupyter-minimal-ubi8-python-3.8-amd64"
186186
expected_img_size=5333
187187
;;
188-
odh-pytorch-gpu-notebook-image-n)
188+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n)
189189
expected_name="odh-notebook-jupyter-cuda-pytorch-ubi9-python-3.11"
190190
expected_commitref="main"
191191
expected_build_name="cuda-jupyter-pytorch-ubi9-python-3.11-amd64"
@@ -197,31 +197,31 @@ function check_image_variable_matches_name_and_commitref_and_size() {
197197
expected_build_name="jupyter-pytorch-ubi9-python-3.11-amd64"
198198
expected_img_size=8571
199199
;;
200-
odh-pytorch-gpu-notebook-image-n-2)
200+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n-2)
201201
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
202202
expected_commitref="release-2024a"
203203
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
204204
expected_img_size=9354
205205
;;
206-
odh-pytorch-gpu-notebook-image-n-3)
206+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n-3)
207207
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
208208
expected_commitref="release-2023b"
209209
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
210210
expected_img_size=8711
211211
;;
212-
odh-pytorch-gpu-notebook-image-n-4)
212+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n-4)
213213
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
214214
expected_commitref="release-2023a"
215215
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
216216
expected_img_size=7130
217217
;;
218-
odh-pytorch-gpu-notebook-image-n-5)
218+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n-5)
219219
expected_name="odh-notebook-cuda-jupyter-pytorch-ubi8-python-3.8"
220220
expected_commitref="release-1.2"
221221
expected_build_name="jupyter-pytorch-ubi8-python-3.8-amd64"
222222
expected_img_size=6592
223223
;;
224-
odh-generic-data-science-notebook-image-n)
224+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n)
225225
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
226226
expected_commitref="main"
227227
expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
@@ -233,25 +233,25 @@ function check_image_variable_matches_name_and_commitref_and_size() {
233233
expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
234234
expected_img_size=961
235235
;;
236-
odh-generic-data-science-notebook-image-n-2)
236+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n-2)
237237
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
238238
expected_commitref="release-2024a"
239239
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
240240
expected_img_size=890
241241
;;
242-
odh-generic-data-science-notebook-image-n-3)
242+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n-3)
243243
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
244244
expected_commitref="release-2023b"
245245
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
246246
expected_img_size=883
247247
;;
248-
odh-generic-data-science-notebook-image-n-4)
248+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n-4)
249249
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
250250
expected_commitref="release-2023a"
251251
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
252252
expected_img_size=685
253253
;;
254-
odh-generic-data-science-notebook-image-n-5)
254+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-n-5)
255255
expected_name="odh-notebook-jupyter-datascience-ubi8-python-3.8"
256256
expected_commitref="release-1.2"
257257
expected_build_name="jupyter-datascience-ubi8-python-3.8-amd64"
@@ -269,31 +269,31 @@ function check_image_variable_matches_name_and_commitref_and_size() {
269269
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.11-amd64"
270270
expected_img_size=8211
271271
;;
272-
odh-tensorflow-gpu-notebook-image-n-2)
272+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n-2)
273273
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
274274
expected_commitref="release-2024a"
275275
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
276276
expected_img_size=6984
277277
;;
278-
odh-tensorflow-gpu-notebook-image-n-3)
278+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n-3)
279279
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
280280
expected_commitref="release-2023b"
281281
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
282282
expected_img_size=6301
283283
;;
284-
odh-tensorflow-gpu-notebook-image-n-4)
284+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n-4)
285285
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
286286
expected_commitref="release-2023a"
287287
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
288288
expected_img_size=5927
289289
;;
290-
odh-tensorflow-gpu-notebook-image-n-5)
290+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n-5)
291291
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi8-python-3.8"
292292
expected_commitref="release-1.2"
293293
expected_build_name="cuda-jupyter-tensorflow-ubi8-python-3.8-amd64"
294294
expected_img_size=6309
295295
;;
296-
odh-trustyai-notebook-image-n)
296+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n)
297297
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
298298
expected_commitref="main"
299299
expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
@@ -305,25 +305,25 @@ function check_image_variable_matches_name_and_commitref_and_size() {
305305
expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
306306
expected_img_size=4197
307307
;;
308-
odh-trustyai-notebook-image-n-2)
308+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n-2)
309309
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
310310
expected_commitref="release-2024a"
311311
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
312312
expected_img_size=1123
313313
;;
314-
odh-trustyai-notebook-image-n-3)
314+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n-3)
315315
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
316316
expected_commitref="release-2023b"
317317
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
318318
expected_img_size=1057
319319
;;
320-
odh-trustyai-notebook-image-n-4)
320+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n-4)
321321
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
322322
expected_commitref="release-2023a"
323323
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
324324
expected_img_size=883
325325
;;
326-
odh-codeserver-notebook-image-n)
326+
odh-workbench-codeserver-datascience-cpu-py311-ubi9-n)
327327
expected_name="odh-notebook-code-server-ubi9-python-3.11"
328328
expected_commitref="main"
329329
expected_build_name="codeserver-ubi9-python-3.11-amd64"
@@ -335,13 +335,13 @@ function check_image_variable_matches_name_and_commitref_and_size() {
335335
expected_build_name="codeserver-ubi9-python-3.11-amd64"
336336
expected_img_size=893
337337
;;
338-
odh-codeserver-notebook-image-n-2)
338+
odh-workbench-codeserver-datascience-cpu-py311-ubi9-n-2)
339339
expected_name="odh-notebook-code-server-ubi9-python-3.9"
340340
expected_commitref="release-2024a"
341341
expected_build_name="codeserver-ubi9-python-3.9-amd64"
342342
expected_img_size=837
343343
;;
344-
odh-codeserver-notebook-image-n-3)
344+
odh-workbench-codeserver-datascience-cpu-py311-ubi9-n-3)
345345
expected_name="odh-notebook-code-server-ubi9-python-3.9"
346346
expected_commitref="release-2023b"
347347
expected_build_name="codeserver-ubi9-python-3.9-amd64"

‎manifests/base/commit-latest.env

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n=b38759a
2-
odh-workbench-jupyter-minimal-cuda-py311-ubi9-commit-n=b38759a
3-
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-commit-n=b38759a
4-
odh-workbench-jupyter-datascience-cpu-py311-ubi9-commit-n=b38759a
5-
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-commit-n=b38759a
6-
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-commit-n=b38759a
7-
odh-workbench-codeserver-datascience-cpu-py311-ubi9-commit-n=b38759a
8-
odh-workbench-rstudio-minimal-cpu-py311-c9s-commit-n=b38759a
9-
odh-workbench-rstudio-minimal-cuda-py311-c9s-commit-n=b38759a
10-
odh-workbench-jupyter-minimal-rocm-py311-ubi9-commit-n=b38759a
11-
odh-workbench-jupyter-pytorch-rocm-py311-ubi9-commit-n=b38759a
12-
odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-commit-n=b38759a
1+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n=b5cf05d
2+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-commit-n=b5cf05d
3+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-commit-n=b5cf05d
4+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-commit-n=b5cf05d
5+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-commit-n=b5cf05d
6+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-commit-n=b5cf05d
7+
odh-workbench-codeserver-datascience-cpu-py311-ubi9-commit-n=b5cf05d
8+
odh-workbench-jupyter-minimal-rocm-py311-ubi9-commit-n=b5cf05d
9+
odh-workbench-jupyter-pytorch-rocm-py311-ubi9-commit-n=b5cf05d
10+
odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-commit-n=b5cf05d

‎manifests/base/commit.env

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,35 @@
1-
odh-minimal-notebook-image-commit-n=b5cf05d
2-
odh-minimal-notebook-image-commit-n-1=be38cca
3-
odh-minimal-notebook-image-commit-n-2=b42b86c
4-
odh-minimal-notebook-image-commit-n-3=76a016f
5-
odh-minimal-notebook-image-commit-n-4=07015ec
6-
odh-minimal-notebook-image-commit-n-5=3e71410
7-
odh-minimal-gpu-notebook-image-commit-n=b5cf05d
8-
odh-minimal-gpu-notebook-image-commit-n-1=be38cca
9-
odh-minimal-gpu-notebook-image-commit-n-2=b42b86c
10-
odh-minimal-gpu-notebook-image-commit-n-3=76a016f
11-
odh-minimal-gpu-notebook-image-commit-n-4=07015ec
12-
odh-minimal-gpu-notebook-image-commit-n-5=3e71410
13-
odh-pytorch-gpu-notebook-image-commit-n=b5cf05d
14-
odh-pytorch-gpu-notebook-image-commit-n-1=be38cca
15-
odh-pytorch-gpu-notebook-image-commit-n-2=b42b86c
16-
odh-pytorch-gpu-notebook-image-commit-n-3=76a016f
17-
odh-pytorch-gpu-notebook-image-commit-n-4=07015ec
18-
odh-pytorch-gpu-notebook-image-commit-n-5=3e71410
19-
odh-generic-data-science-notebook-image-commit-n=b5cf05d
20-
odh-generic-data-science-notebook-image-commit-n-1=be38cca
21-
odh-generic-data-science-notebook-image-commit-n-2=b42b86c
22-
odh-generic-data-science-notebook-image-commit-n-3=76a016f
23-
odh-generic-data-science-notebook-image-commit-n-4=07015ec
24-
odh-generic-data-science-notebook-image-commit-n-5=3e71410
25-
odh-tensorflow-gpu-notebook-image-commit-n=b5cf05d
26-
odh-tensorflow-gpu-notebook-image-commit-n-1=be38cca
27-
odh-tensorflow-gpu-notebook-image-commit-n-2=b42b86c
28-
odh-tensorflow-gpu-notebook-image-commit-n-3=76a016f
29-
odh-tensorflow-gpu-notebook-image-commit-n-4=07015ec
30-
odh-tensorflow-gpu-notebook-image-commit-n-5=3e71410
31-
odh-trustyai-notebook-image-commit-n=b5cf05d
32-
odh-trustyai-notebook-image-commit-n-1=be38cca
33-
odh-trustyai-notebook-image-commit-n-2=b42b86c
34-
odh-trustyai-notebook-image-commit-n-3=76a016f
35-
odh-trustyai-notebook-image-commit-n-4=07015ec
36-
odh-codeserver-notebook-image-commit-n=b5cf05d
37-
odh-codeserver-notebook-image-commit-n-1=be38cca
38-
odh-codeserver-notebook-image-commit-n-2=b42b86c
39-
odh-codeserver-notebook-image-commit-n-3=76a016f
40-
odh-rocm-minimal-notebook-image-commit-n=b5cf05d
41-
odh-rocm-minimal-notebook-image-commit-n-1=be38cca
42-
odh-rocm-pytorch-notebook-image-commit-n=b5cf05d
43-
odh-rocm-pytorch-notebook-image-commit-n-1=be38cca
44-
odh-rocm-tensorflow-notebook-image-commit-n=b5cf05d
45-
odh-rocm-tensorflow-notebook-image-commit-n-1=be38cca
1+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n-1=be38cca
2+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n-2=b42b86c
3+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n-3=76a016f
4+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n-4=07015ec
5+
odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n-5=3e71410
6+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-commit-n-1=be38cca
7+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-commit-n-2=b42b86c
8+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-commit-n-3=76a016f
9+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-commit-n-4=07015ec
10+
odh-workbench-jupyter-minimal-cuda-py311-ubi9-commit-n-5=3e71410
11+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-commit-n-1=be38cca
12+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-commit-n-2=b42b86c
13+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-commit-n-3=76a016f
14+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-commit-n-4=07015ec
15+
odh-workbench-jupyter-pytorch-cuda-py311-ubi9-commit-n-5=3e71410
16+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-commit-n-1=be38cca
17+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-commit-n-2=b42b86c
18+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-commit-n-3=76a016f
19+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-commit-n-4=07015ec
20+
odh-workbench-jupyter-datascience-cpu-py311-ubi9-commit-n-5=3e71410
21+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-commit-n-1=be38cca
22+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-commit-n-2=b42b86c
23+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-commit-n-3=76a016f
24+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-commit-n-4=07015ec
25+
odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-commit-n-5=3e71410
26+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-commit-n-1=be38cca
27+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-commit-n-2=b42b86c
28+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-commit-n-3=76a016f
29+
odh-workbench-jupyter-trustyai-cpu-py311-ubi9-commit-n-4=07015ec
30+
odh-workbench-codeserver-datascience-cpu-py311-ubi9-commit-n-1=be38cca
31+
odh-workbench-codeserver-datascience-cpu-py311-ubi9-commit-n-2=b42b86c
32+
odh-workbench-codeserver-datascience-cpu-py311-ubi9-commit-n-3=76a016f
33+
odh-workbench-jupyter-minimal-rocm-py311-ubi9-commit-n-1=be38cca
34+
odh-workbench-jupyter-pytorch-rocm-py311-ubi9-commit-n-1=be38cca
35+
odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-commit-n-1=be38cca

0 commit comments

Comments
 (0)