diff --git a/ci/fih-tests_install.sh b/ci/fih-tests_install.sh index d69308a6..1e78aafd 100755 --- a/ci/fih-tests_install.sh +++ b/ci/fih-tests_install.sh @@ -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 diff --git a/ci/fih-tests_run.sh b/ci/fih-tests_run.sh index 02373068..c65d2182 100755 --- a/ci/fih-tests_run.sh +++ b/ci/fih-tests_run.sh @@ -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 &&\ @@ -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 diff --git a/ci/fih-tests_version.sh b/ci/fih-tests_version.sh new file mode 100644 index 00000000..a46aae3c --- /dev/null +++ b/ci/fih-tests_version.sh @@ -0,0 +1 @@ +FIH_IMAGE_VERSION=0.0.3