OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ci: Fix FIH Docker image release usage 

The scripts for fih tests install and run where running different
versions of the docker images, since the install specified a version and
not version was specified for run, defaulting to `latest`.

This commits adds a new file for specifying the docker image to be used.

Signed-off-by: Fabio Utzig <utzig@apache.org>
(cherry picked from commit 4619da5660)
This commit is contained in:
Fabio Utzig 2024-09-04 17:17:50 -03:00 committed by Jamie McCrae
parent a990c6b66a
commit 0fe7ffd803
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/fih-tests_install.sh
View File

@ -16,9 +16,11 @@
set -e set -e
source $(dirname "$0")/fih-tests_version.sh
DOCKER_DIR=docker DOCKER_DIR=docker
IMAGE=fih-test:0.0.2 IMAGE=fih-test:$FIH_IMAGE_VERSION
CACHED_IMAGE=$DOCKER_DIR/$IMAGE CACHED_IMAGE=$DOCKER_DIR/$IMAGE

6
ci/fih-tests_run.sh
View File

@ -16,6 +16,8 @@
set -e set -e
source $(dirname "$0")/fih-tests_version.sh
pushd .. &&\ pushd .. &&\
git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git &&\ git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git &&\
pushd trusted-firmware-m &&\ pushd trusted-firmware-m &&\
@ -45,7 +47,7 @@ if [[ $GITHUB_ACTIONS == true ]]; then
fi fi
if test -z "$FIH_LEVEL"; then if test -z "$FIH_LEVEL"; then
docker run --rm -v $(pwd):/root/work/tfm:rw,z mcuboot/fih-test /bin/sh -c '/root/work/tfm/mcuboot/ci/fih_test_docker/execute_test.sh $0 $1 $2' $SKIP_SIZE $BUILD_TYPE $DAMAGE_TYPE docker run --rm -v $(pwd):/root/work/tfm:rw,z mcuboot/fih-test:$FIH_IMAGE_VERSION /bin/sh -c '/root/work/tfm/mcuboot/ci/fih_test_docker/execute_test.sh $0 $1 $2' $SKIP_SIZE $BUILD_TYPE $DAMAGE_TYPE
else else
docker run --rm -v $(pwd):/root/work/tfm:rw,z mcuboot/fih-test /bin/sh -c '/root/work/tfm/mcuboot/ci/fih_test_docker/execute_test.sh $0 $1 $2 $3' $SKIP_SIZE $BUILD_TYPE $DAMAGE_TYPE $FIH_LEVEL docker run --rm -v $(pwd):/root/work/tfm:rw,z mcuboot/fih-test:$FIH_IMAGE_VERSION /bin/sh -c '/root/work/tfm/mcuboot/ci/fih_test_docker/execute_test.sh $0 $1 $2 $3' $SKIP_SIZE $BUILD_TYPE $DAMAGE_TYPE $FIH_LEVEL
fi fi

1
ci/fih-tests_version.sh Normal file
View File

@ -0,0 +1 @@
FIH_IMAGE_VERSION=0.0.3