diff options
| author | Tomeu Vizoso <[email protected]> | 2020-03-24 12:58:30 +0100 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-26 09:30:48 +0000 |
| commit | 92f3c51560f9eb2387b1d929f694244c0b7bd577 (patch) | |
| tree | 822ba14faa2b9c06594384f23131cdbe141daedb /.gitlab-ci/tracie-runner-vk.sh | |
| parent | b94c277fd1e7e8008ccc37aa2f4dd547ef92688b (diff) | |
gitlab-ci: Place files from the Mesa repo into the build tarball
There's some files from the .gitlab-ci directory that are needed in the
test stage and that, because the Mesa repository isn't checked out in
that stage, need to be made available through other means.
Because those files are going to be needed in LAVA devices, place them
ino the tarball containing the built files so it's available to both
gitlab-ci runners and LAVA devices.
Before those files were passed in the artifacts of the Gitlab CI job,
but this commit places them into the built tarball so scripts later in
the pipeline don't need to account for this discrepancy.
Signed-off-by: Tomeu Vizoso <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4295>
Diffstat (limited to '.gitlab-ci/tracie-runner-vk.sh')
| -rwxr-xr-x | .gitlab-ci/tracie-runner-vk.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/tracie-runner-vk.sh b/.gitlab-ci/tracie-runner-vk.sh index e3f8c5d5319..da03967d767 100755 --- a/.gitlab-ci/tracie-runner-vk.sh +++ b/.gitlab-ci/tracie-runner-vk.sh @@ -2,7 +2,7 @@ set -ex -ARTIFACTS="$(pwd)/artifacts" +INSTALL="$(pwd)/install" # Set the Vulkan driver to use. export VK_ICD_FILENAMES="$(pwd)/install/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json" @@ -12,7 +12,7 @@ export VK_LAYER_PATH="$VK_LAYER_PATH:/VulkanTools/build/etc/vulkan/explicit_laye export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/VulkanTools/build/lib" # Perform a self-test to ensure tracie is working properly. -"$ARTIFACTS/tracie/tests/test.sh" +"$INSTALL/tracie/tests/test.sh" ret=0 @@ -22,6 +22,6 @@ ret=0 # file: # https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section PATH="/gfxreconstruct/build/bin:$PATH" \ - python3 $ARTIFACTS/tracie/tracie.py --file $ARTIFACTS/traces.yml --device-name $DEVICE_NAME + python3 $INSTALL/tracie/tracie.py --file $INSTALL/traces.yml --device-name $DEVICE_NAME exit $ret |