commit 1e8c0cd4fd80c9d02feb19e7a349f464ffd3a12f
author Olivier Deprez <olivier.deprez@arm.com> Tue Sep 05 10:53:54 2023 +0200
committer Olivier Deprez <olivier.deprez@arm.com> Tue Sep 05 10:53:54 2023 +0200
tree 9e37fe8e2e5779161bf8acd104a0cc6923400dc6
parent c186e34c0ac02df2bc3e779b2d324b296e3d5d24

ci: use toolchain from docker image

Similarly to [1], update PATH to use clang toolchain sourced from docker
image for the following Hafnium jobs:

hafnium-code-coverage-fvp
hafnium-hypervisor-tf-spmc-test-fvp
hafnium-spmc-test-fvp

[1] https://review.trustedfirmware.org/c/ci/hafnium-ci-scripts/+/21723

Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I5237fc3a4387e8e2a2270d28c592fa99f42c56cc

hafnium-code-coverage-fvp.yaml

diff --git a/hafnium-code-coverage-fvp.yaml b/hafnium-code-coverage-fvp.yaml
index a47d397..ea23ef6 100644
--- a/hafnium-code-coverage-fvp.yaml
+++ b/hafnium-code-coverage-fvp.yaml
@@ -66,7 +66,7 @@
             wget -q "${FVP_MODEL_URL}/${FVP_MODEL_ARCHIVE_NAME}"
             tar xfz "${FVP_MODEL_ARCHIVE_NAME}"
             popd
-            PATH=${WORKSPACE}/prebuilts/linux-x64/clang/bin:${WORKSPACE}/prebuilts/linux-x64/dtc:$PATH
+            PATH=${WORKSPACE}/prebuilts/linux-x64/dtc:$PATH
             make PROJECT=reference ENABLE_ASSERTIONS=1
             if [ "${DEPLOY_HAFNIUM_AS_SPMC}" == "true" ]; then
               kokoro/test_spmc.sh "${ARGS_DEPLOY_SPMC}"

hafnium-hypervisor-tf-spmc-test-fvp.yaml

diff --git a/hafnium-hypervisor-tf-spmc-test-fvp.yaml b/hafnium-hypervisor-tf-spmc-test-fvp.yaml
index 3009f7d..2ff5e07 100644
--- a/hafnium-hypervisor-tf-spmc-test-fvp.yaml
+++ b/hafnium-hypervisor-tf-spmc-test-fvp.yaml
@@ -67,7 +67,7 @@
             wget ${FVP_MODEL_URL}/${FVP_MODEL_ARCHIVE_NAME}
             tar xvfz ${FVP_MODEL_ARCHIVE_NAME}
             popd
-            PATH=${WORKSPACE}/prebuilts/linux-x64/clang/bin:${WORKSPACE}/prebuilts/linux-x64/dtc:$PATH
+            PATH=${WORKSPACE}/prebuilts/linux-x64/dtc:$PATH
             make PROJECT=reference ENABLE_ASSERTIONS=1
             kokoro/test_el3_spmc.sh
     publishers:

hafnium-spmc-test-fvp.yaml

diff --git a/hafnium-spmc-test-fvp.yaml b/hafnium-spmc-test-fvp.yaml
index 3071cb1..96138ec 100644
--- a/hafnium-spmc-test-fvp.yaml
+++ b/hafnium-spmc-test-fvp.yaml
@@ -69,7 +69,7 @@
             wget ${FVP_MODEL_URL}/${FVP_MODEL_ARCHIVE_NAME}
             tar xvfz ${FVP_MODEL_ARCHIVE_NAME}
             popd
-            PATH=${WORKSPACE}/prebuilts/linux-x64/clang/bin:${WORKSPACE}/prebuilts/linux-x64/dtc:$PATH
+            PATH=${WORKSPACE}/prebuilts/linux-x64/dtc:$PATH
             make PROJECT=reference ENABLE_ASSERTIONS=1
             kokoro/test_spmc.sh