ci: Pin tf-m-tests version in FIH test (a29546a1) · Commits · Wenxi XU / Mcuboot

To avoid problems where the latest master of tf-m-tests is incompatible with the fixed version used by the FIH test. Bump the version of TF-M used slightly to a commit that allows the version of tf-m-tests to be easily overridden. [david.brown: Pin to earlier version to avoid issues with missing CMakefile.txt] Signed-off-by:

Raef Coles <raef.coles@arm.com> Signed-off-by:

David Brown <david.brown@linaro.org>

ci/fih_test_docker/Dockerfile

+5 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,10 @@ RUN \
		# Clone TF-M and dependencies
		RUN mkdir -p /root/work/tfm &&\
		cd /root/work/tfm &&\
		git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git -b TF-Mv1.2-RC1 &&\
		git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git &&\
		cd trusted-firmware-m &&\
		git checkout 8501b37db8e038ce39eb7f1039a514edea92c96e &&\
		cd .. &&\
		mkdir mcuboot

		# Copy the test execution script to the image

ci/fih_test_docker/execute_test.sh

+2 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ cmake -B $TFM_BUILD_DIR \
		-DTFM_PSA_API=ON \
		-DMCUBOOT_PATH=$MCUBOOT_PATH \
		-DMCUBOOT_LOG_LEVEL=INFO \
		-DTFM_TEST_REPO_VERSION=93ce2f59c0c4a9cba6062834496b5f45deee4010 \
		$CMAKE_FIH_LEVEL \
		.
		cd $TFM_BUILD_DIR

Admin message