Skip to content

Commit

Permalink
ci: Fix FIH Docker image release usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
utzig committed Sep 4, 2024
1 parent b69e650 commit b1ff89f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 3 additions & 1 deletion ci/fih-tests_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@

set -e

source $(dirname "$0")/fih-tests_version.sh

DOCKER_DIR=docker

IMAGE=fih-test:0.0.2
IMAGE=fih-test:$FIH_IMAGE_VERSION

CACHED_IMAGE=$DOCKER_DIR/$IMAGE

Expand Down
6 changes: 4 additions & 2 deletions ci/fih-tests_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

set -e

source $(dirname "$0")/fih-tests_version.sh

pushd .. &&\
git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git &&\
pushd trusted-firmware-m &&\
Expand Down Expand Up @@ -45,7 +47,7 @@ if [[ $GITHUB_ACTIONS == true ]]; then
fi

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
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
1 change: 1 addition & 0 deletions ci/fih-tests_version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FIH_IMAGE_VERSION=0.0.3

0 comments on commit b1ff89f

Please sign in to comment.