Skip to content

Commit a210f78

Browse files
authored
[mac_ai] testing: images: llama_cpp: update to fedora:42 (#787)
<!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Updated the container image base from CentOS 10 to Fedora 42. * Streamlined and updated package installation commands for improved compatibility and quieter output. * Improved build process reliability with updated package versions and simplified dependency management. * Added a debug statement to display the build flavor during image creation. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents c7d3ef7 + 50942a8 commit a210f78

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

projects/mac_ai/testing/images/llama_cpp.containerfile

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
FROM quay.io/centos/centos:10 AS builder
1+
FROM quay.io/fedora/fedora:42
22
USER 0
33

44
ARG BUILD_FLAVOR="default"
5-
ARG MESA_VERSION=24.2.8-104
5+
ARG MESA_VERSION=25.0.7-100.fc42
66

7-
RUN if [[ ${BUILD_FLAVOR} != remoting ]]; then \
7+
RUN echo "BUILD_FLAVOR: $BUILD_FLAVOR"
8+
9+
RUN if [[ "${BUILD_FLAVOR}" != remoting ]]; then \
810
dnf update && \
9-
dnf install -y python3-dnf-plugin-versionlock && \
10-
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
11-
dnf copr enable -y slp/mesa-krunkit epel-9-aarch64 && \
12-
dnf install -y mesa-vulkan-drivers-${MESA_VERSION}.el9.aarch64 && \
13-
dnf versionlock mesa-vulkan-drivers-${MESA_VERSION}.el9.aarch64 && \
14-
dnf install -y git cmake gcc gcc-c++ vulkan-loader-devel vulkan-tools fmt-devel && \
11+
dnf install -y --quiet python3-dnf-plugin-versionlock && \
12+
dnf copr enable -y slp/mesa-libkrun-vulkan && \
13+
dnf install -y --quiet mesa-vulkan-drivers-${MESA_VERSION} && \
14+
dnf versionlock add mesa-vulkan-drivers-${MESA_VERSION} && \
15+
dnf install -y --quiet vulkan-loader-devel vulkan-tools fmt-devel && \
1516
dnf copr enable -y jeffmaury/shaderc epel-9-aarch64 && \
16-
dnf install -y glslc && \
17-
dnf clean all; \
17+
dnf install -y --quiet glslc; \
1818
fi
1919

2020
# for API Remoting
2121

22-
RUN if [[ ${BUILD_FLAVOR} == remoting ]]; then \
22+
RUN if [[ "${BUILD_FLAVOR}" == remoting ]]; then \
2323
dnf update && \
24-
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
25-
dnf install -y git cmake gcc gcc-c++ libdrm-devel; \
24+
dnf install --quiet -y libdrm-devel; \
2625
fi
2726

27+
RUN dnf install --quiet -y git cmake gcc gcc-c++ && \
28+
dnf clean all
29+
2830
# --- LLAMA.CPP --- #
2931

3032
WORKDIR /app/llama.cpp

projects/repo/toolbox/notifications/send.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ def send_job_completion_notification(reason, status, github=True, slack=False, d
2424
github = False
2525

2626
# currently hardcoded, because there's no configuration file at this level
27-
SECRET_ENV_KEYS = ("PSAP_ODS_SECRET_PATH", "CRC_MAC_AI_SECRET_PATH")
27+
SECRET_ENV_KEYS = ("PSAP_ODS_SECRET_PATH", "CRC_MAC_AI_SECRET_PATH", "CONTAINER_BENCH_SECRET_PATH")
2828

2929
secret_env_key = None
3030
warn = []
3131
for secret_env_key in SECRET_ENV_KEYS:
3232
if os.environ.get(secret_env_key): break
33-
warn.append("{} not defined, cannot access the Github secrets")
33+
warn.append(f"{secret_env_key} not defined, cannot access the Github secrets")
3434
else:
3535
for warning in warn:
36-
logging.warning(warn)
36+
logging.warning(warning)
3737
return True
3838

3939
secret_dir = pathlib.Path(os.environ[secret_env_key])

0 commit comments

Comments
 (0)