Skip to content

WIP: Update FIH docker to Ubuntu Plucky (25.04) #2513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: Update FIH docker to Ubuntu Plucky (25.04) #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ci/fih-tests_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
# Copyright (c) 2025 Arm Limited
#

FIH_IMAGE_VERSION=0.0.3
FIH_IMAGE_VERSION=0.0.4

FIH_IMAGE_NAME=mcuboot-fih-test

FIH_IMAGE=$FIH_IMAGE_NAME:$FIH_IMAGE_VERSION

CONTAINER_REGISTRY=ghcr.io/mcu-tools

TFM_TAG=ef7e8f34b48100c9ab0d169980e84d37d6b3c8b9
2 changes: 1 addition & 1 deletion ci/fih-tests_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ source $(dirname "$0")/fih-tests_config.sh
pushd ..
git clone https://github.com/mcu-tools/trusted-firmware-m
pushd trusted-firmware-m
git checkout eb8ff0db7d657b77abcd0262d5bf7f38eb1e1cdc
git checkout $TFM_TAG
source lib/ext/tf-m-tests/version.txt
popd
git clone https://github.com/mcu-tools/tf-m-tests.git
Expand Down
24 changes: 15 additions & 9 deletions ci/fih_test_docker/docker-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Arm Limited
# Copyright (c) 2020-2025 Arm Limited
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:jammy
FROM ubuntu:plucky

# Get dependencies for retrieving and building TF-M with MCUBoot, and QEMU.
RUN apt-get update && \
Expand All @@ -23,23 +23,29 @@ RUN apt-get update && \
gcc-arm-none-eabi \
gdb-multiarch \
git \
libncurses5 \
libncurses6 \
python3 \
python3-pip \
python3-venv \
qemu-system-arm \
file &&\
apt-get clean all

# Installing python packages
RUN python3 -m pip install \
# Add tfm work directory
WORKDIR /root/work

# Get rid of spurious git ownership errors
RUN git config --global --add safe.directory '*'

# Create Python virtual environment since PEP 668 protection is present
RUN python3 -m venv .venv

# Activate Python environment and install Python packages
RUN . .venv/bin/activate && python3 -m pip install \
imgtool>=1.9.0 \
Jinja2>=2.10.3 \
PyYAML \
pyasn1

# Add tfm work directory && get rid of spurious git ownership errors
RUN mkdir -p /root/work/tfm &&\
git config --global --add safe.directory '*'

# run the command
CMD ["bash"]
9 changes: 8 additions & 1 deletion ci/fih_test_docker/execute_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -x

# Copyright (c) 2020-2023 Arm Limited
# Copyright (c) 2020-2025 Arm Limited
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -18,6 +18,13 @@ set -e

source $(dirname "$0")/paths.sh

# Activate Python virtual environment
source $WORK_PATH/../.venv/bin/activate

# Required for git am to apply patches under TF-M
git config --global user.email "docker@fih-test.com"
git config --global user.name "docker fih-test"

SKIP_SIZE=$1
BUILD_TYPE=$2
DAMAGE_TYPE=$3
Expand Down
Loading