Merge branch 'main' into main

Author: jpeel-impinj

Dockerfile.base

@@ -1,10 +1,14 @@
 # Base Image (ci-base)
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG USERNAME=user
 ARG UID=1000
 ARG GID=1000
+ARG PYTHON_VENV_PATH=/opt/python/venv
+
+# this conflicts with uid 1000, remove it
+RUN userdel -r ubuntu || true
 
 # Set default shell during Docker image build to bash
 SHELL ["/bin/bash", "-c"]
@@ -43,7 +47,6 @@ RUN apt-get -y update && \
 		git-core \
 		gnupg \
 		gperf \
-		gtk-sharp2 \
 		help2man \
 		iproute2 \
 		lcov \
@@ -71,7 +74,7 @@ RUN apt-get -y update && \
 		python3-ply \
 		python3-setuptools \
 		python-is-python3 \
-		qemu \
+		python3-venv \
 		rsync \
 		socat \
 		srecord \
@@ -97,7 +100,7 @@ RUN if [ "${HOSTTYPE}" = "x86_64" ]; then \
 	apt-get -y update && \
 	apt-get -y upgrade && \
 	apt-get install --no-install-recommends -y \
-		libsdl2-dev:i386 libfuse-dev:i386 libc6-dbg:i386 \
+		libsdl2-dev:i386 libfuse-dev:i386 libc6-dbg:i386 python3\
 	; fi
 
 # Initialise system locale
@@ -106,14 +109,19 @@ ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
 
+RUN mkdir -p ${PYTHON_VENV_PATH} && \
+    python3 -m venv ${PYTHON_VENV_PATH}
+
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH
+
+RUN cd ${PYTHON_VENV_PATH}/bin && \
+    pip install --no-cache-dir --upgrade pip setuptools wheel
+
 # Install Python dependencies
-RUN python3 -m pip install -U --no-cache-dir pip && \
-	pip3 install -U --no-cache-dir wheel setuptools && \
-	pip3 install --no-cache-dir pygobject && \
-	pip3 install --no-cache-dir \
+RUN pip3 install --no-cache-dir \
 		-r https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/main/scripts/requirements.txt \
 		-r https://raw.githubusercontent.com/zephyrproject-rtos/mcuboot/main/scripts/requirements.txt \
-		GitPython imgtool junitparser junit2html numpy protobuf PyGithub \
+		GitPython imgtool junitparser junit2html numpy protobuf grpcio-tools PyGithub \
 		pylint sh statistics west \
 		nrf-regtool~=9.0.1
 # Run pip check on x86 only for now, it fails on arm.

Dockerfile.ci

@@ -4,7 +4,7 @@ ARG BASE_IMAGE
 FROM ${BASE_IMAGE:-zephyrprojectrtos/ci-base:latest}
 
 ARG USERNAME=user
-ARG ZSDK_VERSION=0.17.1-rc1
+ARG ZSDK_VERSION=0.17.1-rc2
 ENV ZSDK_VERSION=$ZSDK_VERSION
 ARG KITWARE_NINJA_VERSION=1.11.1.g95dee.kitware.jobserver-1
 ENV KITWARE_NINJA_VERSION=$KITWARE_NINJA_VERSION
@@ -14,9 +14,9 @@ ARG DOXYGEN_VERSION=1.9.4
 ENV DOXYGEN_VERSION=$DOXYGEN_VERSION
 ARG RENODE_VERSION=1.15.3
 ENV RENODE_VERSION=$RENODE_VERSION
-ARG LLVM_VERSION=16
+ARG LLVM_VERSION=20
 ENV LLVM_VERSION=$LLVM_VERSION
-ARG BSIM_VERSION=v2.5
+ARG BSIM_VERSION=v2.6
 ENV BSIM_VERSION=$BSIM_VERSION
 ARG SPARSE_VERSION=9212270048c3bd23f56c20a83d4f89b870b2b26e
 ENV SPARSE_VERSION=$SPARSE_VERSION
@@ -57,7 +57,7 @@ RUN if [ "${HOSTTYPE}" = "x86_64" ]; then \
 # Install Doxygen (x86 only)
 # NOTE: Pre-built Doxygen binaries are only available for x86_64 host.
 RUN if [ "${HOSTTYPE}" = "x86_64" ]; then \
-	wget ${WGET_ARGS} https://downloads.sourceforge.net/project/doxygen/rel-${DOXYGEN_VERSION}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz && \
+	wget ${WGET_ARGS} "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz" && \
 	tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt && \
 	ln -s /opt/doxygen-${DOXYGEN_VERSION}/bin/doxygen /usr/local/bin && \
 	rm doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz \
@@ -141,6 +141,10 @@ RUN mkdir -p /opt/toolchains && \
 #
 # Ecosystem FVP License permits redistribution (refer to the relevant license available in the container).
 RUN set -o pipefail && \
+	apt update && \
+	apt install software-properties-common && \
+	add-apt-repository -y ppa:deadsnakes/ppa && \
+	apt install -y python3.9-dev && \
 	mkdir -p /opt/fvps && \
 	cd /opt/fvps && \
 	if [ "${HOSTTYPE}" = "x86_64" ]; then SUFFIX=""; else SUFFIX="_armv8l"; fi && \