Skip to content

Commit 38266db

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #751 from opendatahub-io/sync__main__2024b__20241018041710
Sync `2024b` branch with `main` branch
2 parents f5882d2 + 36f1e65 commit 38266db

File tree

65 files changed

+29481
-26134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+29481
-26134
lines changed

‎.github/workflows/build-notebooks-TEMPLATE.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ name: Build & Publish Notebook Servers (TEMPLATE)
1818

1919
jobs:
2020
build:
21-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-22.04
2222
env:
2323
# GitHub image registry used for storing $(CONTAINER_ENGINE)'s cache
2424
CACHE: "ghcr.io/${{ github.repository }}/workbench-images/build-cache"
@@ -97,6 +97,7 @@ jobs:
9797

9898
- name: Configure Podman
9999
run: |
100+
set -x
100101
mkdir -p $HOME/.config/containers/
101102
cp ci/cached-builds/containers.conf $HOME/.config/containers/containers.conf
102103
cp ci/cached-builds/storage.conf $HOME/.config/containers/storage.conf

‎.github/workflows/code-quality.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,13 @@ jobs:
4545

4646
- name: Install poetry
4747
if: steps.cache-poetry-restore.outputs.cache-hit != 'true'
48-
run: pip install poetry==${{ env.poetry_version }}
48+
run: pipx install poetry==${{ env.poetry_version }}
49+
env:
50+
PIPX_HOME: /home/runner/.local/pipx
51+
PIPX_BIN_DIR: /home/runner/.local/bin
52+
53+
- name: Check poetry is installed correctly
54+
run: poetry env info
4955

5056
- name: Save cache
5157
if: steps.cache-poetry-restore.outputs.cache-hit != 'true'

‎.github/workflows/notebooks-digest-updater-upstream.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ jobs:
8282
skopeo_metadata=$(skopeo inspect --retry-times 3 "docker://${img}")
8383
8484
src_tag=$(echo "${skopeo_metadata}" | jq '.Env[] | select(startswith("OPENSHIFT_BUILD_NAME=")) | split("=")[1]' | tr -d '"' | sed 's/-amd64$//')
85-
src_tag2=$(echo $src_tag | sed 's/python-3.9/python-3.11/')
86-
regex="^$src_tag2-${{ env.RELEASE_VERSION_N}}-\d+-${{ steps.hash-n.outputs.HASH_N }}\$"
85+
regex="^$src_tag-${{ env.RELEASE_VERSION_N}}-\d+-${{ steps.hash-n.outputs.HASH_N }}\$"
8786
latest_tag=$(echo "${skopeo_metadata}" | jq -r --arg regex "$regex" '.RepoTags | map(select(. | test($regex))) | .[0]')
8887
# use `--no-tags` for skopeo once available in newer version
8988
digest=$(skopeo inspect --retry-times 3 "docker://${registry}:${latest_tag}" | jq .Digest | tr -d '"')

‎ci/check-params-env.sh

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -91,114 +91,111 @@ function check_image_variable_matches_name_and_commitref() {
9191
local expected_build_name # Why some of the images has `-amd64` suffix and others not?
9292
case "${image_variable}" in
9393
odh-minimal-notebook-image-n)
94-
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
95-
expected_commitref="2024a"
96-
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
94+
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
95+
expected_commitref="2024b"
96+
expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
9797
;;
9898
odh-minimal-notebook-image-n-1)
9999
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
100-
expected_commitref="2023b"
100+
expected_commitref="2024a"
101101
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
102102
;;
103103
odh-minimal-gpu-notebook-image-n)
104-
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
105-
expected_commitref="2024a"
106-
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
104+
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
105+
expected_commitref="2024b"
106+
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.11-amd64"
107107
;;
108108
odh-minimal-gpu-notebook-image-n-1)
109109
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
110-
expected_commitref="2023b"
110+
expected_commitref="2024a"
111111
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
112112
;;
113113
odh-pytorch-gpu-notebook-image-n)
114-
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
115-
expected_commitref="2024a"
116-
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
114+
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.11"
115+
expected_commitref="2024b"
116+
expected_build_name="jupyter-pytorch-ubi9-python-3.11-amd64"
117117
;;
118118
odh-pytorch-gpu-notebook-image-n-1)
119119
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
120-
expected_commitref="2023b"
120+
expected_commitref="2024a"
121121
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
122122
;;
123123
odh-generic-data-science-notebook-image-n)
124-
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
125-
expected_commitref="2024a"
126-
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
124+
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
125+
expected_commitref="2024b"
126+
expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
127127
;;
128128
odh-generic-data-science-notebook-image-n-1)
129129
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
130-
expected_commitref="2023b"
130+
expected_commitref="2024a"
131131
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
132132
;;
133133
odh-tensorflow-gpu-notebook-image-n)
134-
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
135-
expected_commitref="2024a"
136-
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
134+
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
135+
expected_commitref="2024b"
136+
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.11-amd64"
137137
;;
138138
odh-tensorflow-gpu-notebook-image-n-1)
139139
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
140-
expected_commitref="2023b"
140+
expected_commitref="2024a"
141141
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
142142
;;
143143
odh-trustyai-notebook-image-n)
144-
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
145-
expected_commitref="2024a"
146-
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
144+
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
145+
expected_commitref="2024b"
146+
expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
147147
;;
148148
odh-trustyai-notebook-image-n-1)
149149
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
150-
expected_commitref="2023b"
150+
expected_commitref="2024a"
151151
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
152152
;;
153153
odh-codeserver-notebook-image-n)
154-
expected_name="odh-notebook-code-server-ubi9-python-3.9"
155-
expected_commitref="2024a"
156-
expected_build_name="codeserver-ubi9-python-3.9-amd64"
154+
expected_name="odh-notebook-code-server-ubi9-python-3.11"
155+
expected_commitref="2024b"
156+
expected_build_name="codeserver-ubi9-python-3.11-amd64"
157157
;;
158158
odh-codeserver-notebook-image-n-1)
159159
expected_name="odh-notebook-code-server-ubi9-python-3.9"
160-
expected_commitref="2023b"
160+
expected_commitref="2024a"
161161
expected_build_name="codeserver-ubi9-python-3.9-amd64"
162162
;;
163163
odh-rstudio-notebook-image-n)
164-
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
165-
expected_commitref="2024a"
166-
expected_build_name="rstudio-c9s-python-3.9-amd64"
164+
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
165+
expected_commitref="2024b"
166+
expected_build_name="rstudio-c9s-python-3.11-amd64"
167167
;;
168168
odh-rstudio-notebook-image-n-1)
169169
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
170-
expected_commitref="2023b"
170+
expected_commitref="2024a"
171171
expected_build_name="rstudio-c9s-python-3.9-amd64"
172172
;;
173173
# For both RStudio GPU workbenches - the final name labels are identical to plain RStudio ones
174174
# This is because the very same RStudio Dockerfile is used but different base images in both cases
175175
# We should consider what to do with this - in ideal case, we should have different labels for these cases.
176176
odh-rstudio-gpu-notebook-image-n)
177-
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
178-
expected_commitref="2024a"
179-
expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"
177+
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
178+
expected_commitref="2024b"
179+
expected_build_name="cuda-rstudio-c9s-python-3.11-amd64"
180180
;;
181181
odh-rstudio-gpu-notebook-image-n-1)
182182
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
183-
expected_commitref="2023b"
183+
expected_commitref="2024a"
184184
expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"
185185
;;
186186
odh-rocm-minimal-notebook-image-n)
187187
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
188-
expected_commitref="main"
189-
# expected_commitref="2024b"
188+
expected_commitref="2024b"
190189
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
191190
;;
192191
odh-rocm-pytorch-notebook-image-n)
193192
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
194-
expected_commitref="main"
195-
# expected_commitref="2024b"
193+
expected_commitref="2024b"
196194
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
197195
;;
198196
odh-rocm-tensorflow-notebook-image-n)
199197
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
200-
expected_commitref="main"
201-
# expected_commitref="2024b"
198+
expected_commitref="2024b"
202199
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.11-amd64"
203200
;;
204201
*)

‎codeserver/ubi9-python-3.11/run-code-server.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ universal_json_settings='{
4646
"python.defaultInterpreterPath": "/opt/app-root/bin/python3",
4747
"telemetry.telemetryLevel": "off",
4848
"telemetry.enableTelemetry": false,
49-
"workbench.enableExperiments": false
49+
"workbench.enableExperiments": false,
50+
"extensions.autoCheckUpdates": false,
51+
"extensions.autoUpdate": false
5052
}'
5153

5254
# Define python debuger settings

‎codeserver/ubi9-python-3.9/run-code-server.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ universal_json_settings='{
4646
"python.defaultInterpreterPath": "/opt/app-root/bin/python3",
4747
"telemetry.telemetryLevel": "off",
4848
"telemetry.enableTelemetry": false,
49-
"workbench.enableExperiments": false
49+
"workbench.enableExperiments": false,
50+
"extensions.autoCheckUpdates": false,
51+
"extensions.autoUpdate": false
5052
}'
5153

5254
# Define python debuger settings

‎intel/runtimes/ml/ubi9-python-3.11/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plotly = "~=5.16.1"
1919
scipy = "~=1.11.2"
2020
scikit-learn = "~=1.3.1"
2121
skl2onnx = "~=1.15.0"
22-
codeflare-sdk = "~=0.19.1"
22+
codeflare-sdk = "~=0.22.0"
2323
# DB connectors
2424
pymongo = "~=4.5.0"
2525
psycopg = "~=3.1.10"

0 commit comments

Comments
 (0)