Skip to content

Commit 25cd4a6

Browse files
tomasroditomasrodi
authored
Update the docker container to use oneAPI-2025.3
* Recovered the Redhat build. It does not run against N-1. * Added Ubuntu-25.04. It does not run agaist N-1. * Inform the Linux tests when running 2025.3+BMG. There is a problem with the new containers and unitrace, therefore I am pointing it to N-1/2025.2 for now. I will fix later.
1 parent 712cba6 commit 25cd4a6

File tree

14 files changed

+162
-40
lines changed

14 files changed

+162
-40
lines changed

‎.github/workflows/nightly_build_and_test.yml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,34 @@ jobs:
4242
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_NMINUS1 }}
4343
uploadname: ${{ vars.PTI_PKG_UBUNTU_24_4_ONEAPI_NMINUS1 }}
4444
preset: linux-icpx-release
45+
#
46+
# Keep this as place holder for UBUNTU_25_4_ONEAPI_NMINUS1
47+
# and PTI_PKG_RHEL_10_ONEAPI_NMINUS1
48+
#
4549
- container: ${{ vars.PTI_DOCKER_ROCKY_8_ONEAPI_NMINUS1 }}
4650
uploadname: ${{ vars.PTI_PKG_ROCKY_8_ONEAPI_NMINUS1 }}
4751
preset: linux-icpx-release
4852
- container: ${{ vars.PTI_DOCKER_ROCKY_8_ONEAPI_NMINUS1 }}
4953
uploadname: ${{ vars.PTI_PKG_ROCKY_8_GXX_NMINUS1 }}
5054
preset: linux-gxx-release
51-
- container: ${{ vars.PTI_DOCKER_SLES_15_ONEAPI_N }}
52-
uploadname: ${{ vars.PTI_PKG_SLES_15_ONEAPI_N }}
53-
preset: linux-icpx-release
55+
#
56+
# Disabled until PTI-306 gets fixed.
57+
#
58+
#- container: ${{ vars.PTI_DOCKER_SLES_15_ONEAPI_N }}
59+
#uploadname: ${{ vars.PTI_PKG_SLES_15_ONEAPI_N }}
60+
#preset: linux-icpx-release
5461
- container: ${{ vars.PTI_DOCKER_UBUNTU_22_4_ONEAPI_N }}
5562
uploadname: ${{ vars.PTI_PKG_UBUNTU_22_4_ONEAPI_N }}
5663
preset: linux-icpx-release
5764
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_N }}
5865
uploadname: ${{ vars.PTI_PKG_UBUNTU_24_4_ONEAPI_N }}
5966
preset: linux-icpx-release
67+
- container: ${{ vars.PTI_DOCKER_UBUNTU_25_4_ONEAPI_N }}
68+
uploadname: ${{ vars.PTI_PKG_UBUNTU_25_4_ONEAPI_N }}
69+
preset: linux-icpx-release
70+
- container: ${{ vars.PTI_DOCKER_RHEL_10_ONEAPI_N }}
71+
uploadname: ${{ vars.PTI_PKG_RHEL_10_ONEAPI_N }}
72+
preset: linux-icpx-release
6073
- container: ${{ vars.PTI_DOCKER_ROCKY_8_ONEAPI_N }}
6174
uploadname: ${{ vars.PTI_PKG_ROCKY_8_ONEAPI_N }}
6275
preset: linux-icpx-release
@@ -158,7 +171,8 @@ jobs:
158171
max-parallel: 2
159172
matrix:
160173
include:
161-
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_N }}
174+
# Must fix to PTI_DOCKER_UBUNTU_24_4_ONEAPI_N
175+
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_NMINUS1 }}
162176

163177
container:
164178
image: ${{ matrix.container }}

‎.github/workflows/pti-tools_build_and_test.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_N }}
35+
#
36+
# Must fix PTI_DOCKER_UBUNTU_24_4_ONEAPI_N, for now
37+
# point it to N-1
38+
#
39+
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_NMINUS1 }}
3640
tags: '["self-hosted", "Linux", "pti", "PVC"]'
3741
os_id: "ubuntu-22.04.2025.1.0"
38-
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_N }}
42+
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_NMINUS1 }}
3943
tags: '["self-hosted", "Linux", "pti", "BMG"]'
4044
os_id: "ubuntu-22.04.2025.1.0"
4145

‎.github/workflows/sdk_build_and_test.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
matrix:
3636
include:
3737
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_N }}
38-
os_id: "ubuntu-24.04.2025.2.0"
38+
os_id: "ubuntu-24.04.2025.3.0"
3939
preset: linux-icpx-release
4040
tags: '["self-hosted", "Linux", "pti", "client", "BMG"]'
4141
- container: ${{ vars.PTI_DOCKER_UBUNTU_24_4_ONEAPI_N }}
42-
os_id: "ubuntu-24.04.2025.2.0"
42+
os_id: "ubuntu-24.04.2025.3.0"
4343
preset: linux-icpx-release
4444
tags: '["self-hosted", "Linux", "pti", "server", "PVC"]'
4545

@@ -69,6 +69,8 @@ jobs:
6969
with:
7070
wdir: sdk
7171
preset: ${{ matrix.preset }}
72+
adjust-test-bmg: ${{ contains(matrix.tags, 'BMG') }}
73+
adjust-test-2025-3: ${{ contains(matrix.os_id, '2025.3') }}
7274

7375
- name: Build AddressSanitizer
7476
if: contains(fromJSON(matrix.tags), 'server')

‎sdk/docker/docker.mk‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,38 @@ USE_BUILDKIT := 1
22

33
REL_UBUNTU_22:= ubuntu-22-04
44
REL_UBUNTU_24:= ubuntu-24-04
5+
REL_UBUNTU_25:= ubuntu-25-04
56
#
67
# TODO: 5/21/2025
78
# Can't build redhat-9 nor rocky-8 for PVC, there are missing
89
# libraries
910
#
10-
REL_RHEL:= redhat-9
11+
REL_RHEL:= redhat-10
1112
REL_SLES:= sles-15
1213
REL_ROCKY:= rocky-8
13-
OS_TARGETS:= ${REL_SLES} ${REL_UBUNTU_22} ${REL_UBUNTU_24} ${REL_ROCKY}
14+
OS_TARGETS:= ${REL_SLES} ${REL_UBUNTU_22} ${REL_UBUNTU_24} ${REL_UBUNTU_25} ${REL_ROCKY} ${REL_RHEL}
1415
.PHONY:${OS_TARGETS}
1516

16-
ONEAPI_VER=2025.2.0
17+
ONEAPI_VER=2025.3.0
1718

1819
targets: ${OS_TARGETS}
1920
@echo BUILT ${OS_TARGETS}
2021

21-
VER_UBUNTU_22:=03
22-
VER_UBUNTU_24:=03
23-
VER_REDHAT:=03
24-
VER_SLES:=03
25-
VER_ROCKY:=03
22+
VER_UBUNTU_22:=04
23+
VER_UBUNTU_24:=04
24+
VER_UBUNTU_25:=04
25+
VER_REDHAT:=04
26+
VER_SLES:=04
27+
VER_ROCKY:=04
2628
define getOsVer
2729
$(if $(filter $1, ${REL_UBUNTU_22}),${VER_UBUNTU_22},\
2830
$(if $(filter $1, ${REL_UBUNTU_24}),${VER_UBUNTU_24},\
31+
$(if $(filter $1, ${REL_UBUNTU_25}),${VER_UBUNTU_25},\
2932
$(if $(filter $1, ${REL_RHEL}),${VER_REDHAT},\
3033
$(if $(filter $1, ${REL_SLES}),${VER_SLES},\
3134
$(if $(filter $1, ${REL_ROCKY}),${VER_ROCKY},\
3235
$(error "Undefined target $1 in getOsVer function") \
33-
)))))
36+
))))))
3437
endef
3538

3639
define ERROR_MESSAGE_PTI_CONTAINER

sdk/docker/redhat-9/bldrun.Dockerfile renamed to sdk/docker/redhat-10/bldrun.Dockerfile

File renamed without changes.

sdk/docker/redhat-9/min_os.Dockerfile renamed to sdk/docker/redhat-10/min_os.Dockerfile

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM redhat/ubi9
1+
FROM redhat/ubi10
22

33
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
44

@@ -22,7 +22,7 @@ RUN dnf update -y && \
2222
pkgconfig \
2323
wget \
2424
ninja-build \
25-
python3.12 \
25+
python3 \
2626
git \
2727
vim \
2828
sudo && \
@@ -43,10 +43,21 @@ RUN echo '[oneAPI]' > /etc/yum.repos.d/oneAPI.repo; \
4343
#
4444
# Setup the appropriate repos for GPU
4545
#
46-
RUN dnf install -y 'dnf-command(config-manager)' && \
47-
dnf config-manager --add-repo https://repositories.intel.com/gpu/rhel/9.5/unified/intel-gpu-9.5.repo && \
48-
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
46+
RUN rpm --import https://repositories.intel.com/gpu/intel-graphics.key && \
47+
echo "priority=98" >> /etc/yum.repos.d/intel-gpu-10.0.repo && \
48+
dnf install -y 'dnf-command(config-manager)' && \
49+
dnf config-manager --add-repo https://repositories.intel.com/gpu/rhel/10.0/lts/2523/unified/intel-gpu-10.0.repo && \
50+
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm && \
4951
dnf config-manager --disable epel && \
52+
dnf install -y \
53+
intel-opencl intel-media libmfxgen1 libvpl2 \
54+
level-zero intel-level-zero-gpu mesa-dri-drivers mesa-vulkan-drivers \
55+
mesa-vdpau-drivers libdrm mesa-libEGL mesa-libgbm mesa-libGL \
56+
mesa-libxatracker libvpl-tools intel-metrics-discovery \
57+
intel-metrics-library intel-igc-core intel-igc-cm \
58+
libva libva-utils intel-gmmlib libmetee intel-gsc intel-ocloc \
59+
intel-metrics-discovery intel-metrics-discovery-devel \
60+
intel-metrics-library intel-metrics-library-devel && \
5061
dnf clean all
5162

52-
RUN update-alternatives --install /usr/local/bin/python python /usr/bin/python3.12 10
63+
RUN update-alternatives --install /usr/local/bin/python python /usr/bin/python3 10

‎sdk/docker/rocky-8/min_os.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ RUN dnf install -y --setopt=tsflags=nodocs \
3030
sudo \
3131
python3.12 && \
3232
dnf clean all
33+
34+
RUN ln -s /usr/bin/python3.12 /usr/bin/python

‎sdk/docker/sles-15/min_os.Dockerfile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ RUN zypper refresh && \
2525
which \
2626
git \
2727
vim \
28-
python311 && \
28+
python3 && \
2929
zypper clean --all
3030

3131
RUN zypper addrepo https://yum.repos.intel.com/oneapi oneAPI && \
3232
rpm --import https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB && \
33-
zypper addrepo -f -r https://repositories.intel.com/gpu/sles/15sp6/unified/intel-gpu-15sp6.repo && \
33+
zypper addrepo -f -r https://repositories.intel.com/gpu/sles/15sp7/lts/2523/unified/intel-gpu-15sp7.repo && \
3434
rpm --import https://repositories.intel.com/gpu/intel-graphics.key
3535

36-
RUN update-alternatives --install /usr/local/bin/python python /usr/bin/python3.11 10 && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1
37-
38-
36+
RUN update-alternatives --install /usr/local/bin/python python /usr/bin/python3 10

‎sdk/docker/ubuntu-22-04/bldrun.Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ RUN apt update -y && \
2323
libigc-dev intel-igc-cm libigdfcl-dev libigfxcmrt-dev libze-dev \
2424
intel-metrics-discovery intel-metrics-discovery-dev \
2525
intel-metrics-library intel-metrics-library-dev \
26-
intel-dpcpp-cpp-compiler-2025.2 \
27-
intel-oneapi-mkl-devel-2025.2 \
28-
intel-oneapi-dnnl-devel-2025.2 \
29-
intel-oneapi-ccl-devel-2021.16 && \
26+
intel-dpcpp-cpp-compiler-2025.3 \
27+
intel-oneapi-mkl-devel-2025.3 \
28+
intel-oneapi-dnnl-devel-2025.3 \
29+
intel-oneapi-ccl-devel-2021.17 && \
3030
apt-get clean -y

‎sdk/docker/ubuntu-22-04/min_os.Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ RUN wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | \
4747
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy unified" | \
4848
tee /etc/apt/sources.list.d/intel-gpu-jammy.list
4949

50-
RUN update-alternatives --install /usr/local/bin/python python /usr/bin/python3.10 10
50+
RUN update-alternatives --install /usr/local/bin/python python /usr/bin/python3 10
51+

0 commit comments

Comments
 (0)