Skip to content

Commit d4568c9

Browse files
harshad16harshad16
authored
Merge pull request #462 from jstourac/ciParams
[CI] fix the expected metadata of the images
2 parents 0a56535 + cd8ef16 commit d4568c9

File tree

4 files changed

+34
-58
lines changed

4 files changed

+34
-58
lines changed

‎ci/check-params-env.sh

Lines changed: 28 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PARAMS_ENV_PATH="manifests/base/params.env"
2424

2525
# This value needs to be updated everytime we deliberately change number of the
2626
# images we want to have in the `params.env` file.
27-
EXPECTED_NUM_RECORDS=24
27+
EXPECTED_NUM_RECORDS=19
2828

2929
# ---------------------------- DEFINED FUNCTIONS ----------------------------- #
3030

@@ -69,130 +69,102 @@ function check_image_variable_matches_name_and_commitref() {
6969
case "${image_variable}" in
7070
odh-minimal-notebook-image-n)
7171
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
72-
expected_commitref="2023b"
72+
expected_commitref="2024a"
7373
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
7474
;;
7575
odh-minimal-notebook-image-n-1)
7676
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
77-
expected_commitref="2023a"
77+
expected_commitref="2023b"
7878
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
7979
;;
80-
odh-minimal-notebook-image-n-2)
81-
expected_name="odh-notebook-jupyter-minimal-ubi8-python-3.8"
82-
expected_commitref="main"
83-
expected_build_name="jupyter-minimal-ubi8-python-3.8"
84-
;;
8580
odh-minimal-gpu-notebook-image-n)
8681
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
87-
expected_commitref="2023b"
82+
expected_commitref="2024a"
8883
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
8984
;;
9085
odh-minimal-gpu-notebook-image-n-1)
9186
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
92-
expected_commitref="2023a"
87+
expected_commitref="2023b"
9388
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
9489
;;
95-
odh-minimal-gpu-notebook-image-n-2)
96-
expected_name="odh-notebook-jupyter-minimal-ubi8-python-3.8"
97-
expected_commitref="main"
98-
expected_build_name="cuda-jupyter-minimal-ubi8-python-3.8"
99-
;;
10090
odh-pytorch-gpu-notebook-image-n)
10191
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
102-
expected_commitref="2023b"
92+
expected_commitref="2024a"
10393
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
10494
;;
10595
odh-pytorch-gpu-notebook-image-n-1)
10696
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
107-
expected_commitref="2023a"
97+
expected_commitref="2023b"
10898
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
10999
;;
110-
odh-pytorch-gpu-notebook-image-n-2)
111-
expected_name="odh-notebook-cuda-jupyter-pytorch-ubi8-python-3.8"
112-
expected_commitref="main"
113-
expected_build_name="cuda-jupyter-pytorch-ubi8-python-3.8"
114-
;;
115100
odh-generic-data-science-notebook-image-n)
116101
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
117-
expected_commitref="2023b"
102+
expected_commitref="2024a"
118103
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
119104
;;
120105
odh-generic-data-science-notebook-image-n-1)
121106
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
122-
expected_commitref="2023a"
107+
expected_commitref="2023b"
123108
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
124109
;;
125-
odh-generic-data-science-notebook-image-n-2)
126-
expected_name="odh-notebook-jupyter-datascience-ubi8-python-3.8"
127-
expected_commitref="main"
128-
expected_build_name="jupyter-datascience-ubi8-python-3.8"
129-
;;
130110
odh-tensorflow-gpu-notebook-image-n)
131111
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
132-
expected_commitref="2023b"
112+
expected_commitref="2024a"
133113
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
134114
;;
135115
odh-tensorflow-gpu-notebook-image-n-1)
136116
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
137-
expected_commitref="2023a"
117+
expected_commitref="2023b"
138118
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
139119
;;
140-
odh-tensorflow-gpu-notebook-image-n-2)
141-
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi8-python-3.8"
142-
expected_commitref="main"
143-
expected_build_name="cuda-jupyter-tensorflow-ubi8-python-3.8"
144-
;;
145120
odh-trustyai-notebook-image-n)
146121
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
147-
expected_commitref="2023b"
122+
expected_commitref="2024a"
148123
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
149124
;;
150125
odh-trustyai-notebook-image-n-1)
151126
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
152-
expected_commitref="2023a"
127+
expected_commitref="2023b"
153128
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
154129
;;
155130
odh-habana-notebook-image-n)
156131
expected_name="odh-notebook-habana-jupyter-1.10.0-ubi8-python-3.8"
157-
# expected_commitref="2023b"
132+
# expected_commitref="2024a"
158133
expected_commitref="main"
159134
expected_build_name="habana-jupyter-1.10.0-ubi8-python-3.8"
160135
;;
161136
odh-codeserver-notebook-n)
162137
expected_name="odh-notebook-code-server-ubi9-python-3.9"
163-
expected_commitref="2023b"
138+
expected_commitref="2024a"
164139
expected_build_name="codeserver-ubi9-python-3.9-amd64"
165140
;;
166141
odh-codeserver-notebook-n-1)
167-
expected_name="odh-notebook-code-server-c9s-python-3.9"
168-
# expected_commitref="2023a"
169-
expected_commitref="main"
170-
expected_build_name="codeserver-c9s-python-3.9"
142+
expected_name="odh-notebook-code-server-ubi9-python-3.9"
143+
expected_commitref="2023b"
144+
expected_build_name="codeserver-ubi9-python-3.9-amd64"
171145
;;
172146
odh-rstudio-notebook-n)
173-
expected_name="odh-notebook-rstudio-c9s-python-3.9"
174-
expected_commitref="2023b"
147+
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
148+
expected_commitref="2024a"
175149
expected_build_name="rstudio-c9s-python-3.9-amd64"
176150
;;
177151
odh-rstudio-notebook-n-1)
178-
expected_name="odh-notebook-rstudio-c9s-python-3.9"
179-
# expected_commitref="2023a"
180-
expected_commitref="main"
181-
expected_build_name="rstudio-c9s-python-3.9"
152+
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
153+
expected_commitref="2023b"
154+
expected_build_name="rstudio-c9s-python-3.9-amd64"
182155
;;
183156
# For both RStudio GPU workbenches - the final name labels are identical to plain RStudio ones
184157
# This is because the very same RStudio Dockerfile is used but different base images in both cases
185158
# We should consider what to do with this - in ideal case, we should have different labels for these cases.
186159
odh-rstudio-gpu-notebook-n)
187-
expected_name="odh-notebook-rstudio-c9s-python-3.9"
188-
expected_commitref="2023b"
160+
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
161+
expected_commitref="2024a"
189162
expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"
190163
;;
191164
odh-rstudio-gpu-notebook-n-1)
192-
expected_name="odh-notebook-rstudio-c9s-python-3.9"
193-
# expected_commitref="2023a"
194-
expected_commitref="main"
195-
expected_build_name="cuda-rstudio-c9s-python-3.9"
165+
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
166+
expected_commitref="2023b"
167+
expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"
196168
;;
197169
*)
198170
echo "Unimplemented variable name: '${image_variable}'"

‎ci/hadolint-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@ ignored:
3434
- SC2046
3535
# SC2140 warning: Word is of the form "A"B"C" (B indicated). Did you mean "ABC" or "A\"B\"C"?
3636
- SC2140
37+
# SC1091 info: Not following: File not included in mock. (e.g. when you source some file that isn't achievable)
38+
- SC1091
39+
# DL3003 warning: Use WORKDIR to switch to a directory
40+
- DL3003

‎intel/runtimes/pytorch/ubi9-python-3.9/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN cd ${CPU_ENV} && \
4949
chown -R 1001:0 ${CPU_ENV} && \
5050
fix-permissions ${CPU_ENV} -P && \
5151
source ${CPU_ENV}/bin/activate && \
52-
pip install -U "micropipenv[toml]" && \
52+
pip install --no-cache-dir -U "micropipenv[toml]" && \
5353
micropipenv install && \
5454
rm -f ./Pipfile.lock && \
5555
# Fix permissions to support pip in Openshift environments \

‎intel/runtimes/tensorflow/ubi9-python-3.9/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN cd ${CPU_ENV} && \
5454
unlink ${CPU_ENV}/lib64 && \
5555
cp -r ${CPU_ENV}/lib ${CPU_ENV}/lib64 && \
5656
source ${CPU_ENV}/bin/activate && \
57-
pip install -U "micropipenv[toml]" && \
57+
pip install --no-cache-dir -U "micropipenv[toml]" && \
5858
micropipenv install && \
5959
rm -f ./Pipfile.lock && \
6060
# Fix permissions to support pip in Openshift environments \

0 commit comments

Comments
 (0)