summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorTomeu Vizoso <[email protected]>2020-03-24 12:58:30 +0100
committerMarge Bot <[email protected]>2020-03-26 09:30:48 +0000
commit92f3c51560f9eb2387b1d929f694244c0b7bd577 (patch)
tree822ba14faa2b9c06594384f23131cdbe141daedb /.gitlab-ci.yml
parentb94c277fd1e7e8008ccc37aa2f4dd547ef92688b (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.yml')
-rw-r--r--.gitlab-ci.yml26
1 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f9cc15a70d..dcbbb58784f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -587,7 +587,7 @@ scons-old-llvm:
LIBGL_ALWAYS_SOFTWARE: 1
PIGLIT_NO_WINDOW: 1
script:
- - artifacts/piglit/run.sh
+ - install/piglit/run.sh
piglit-quick_gl:
extends: .piglit-test
@@ -624,7 +624,7 @@ piglit-quick_shader:
variables:
DEQP_SKIPS: deqp-default-skips.txt
script:
- - ./artifacts/deqp-runner.sh
+ - ./install/deqp-runner.sh
.deqp-test-gl:
extends:
@@ -641,7 +641,7 @@ piglit-quick_shader:
.fossilize-test:
extends: .test-vk
script:
- - ./artifacts/fossilize-runner.sh
+ - ./install/fossilize-runner.sh
llvmpipe-gles2:
variables:
@@ -790,8 +790,8 @@ arm64_a530_gles3:
- .fossilize-test
- .test-radv
script:
- - ./artifacts/fossilize-runner.sh
- - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./artifacts/fossilize-runner.sh
+ - ./install/fossilize-runner.sh
+ - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh
# Can only be triggered manually on personal branches because RADV is the only
# driver that does Vulkan testing at the moment.
@@ -812,16 +812,16 @@ radv-fossils:
script:
# Polaris10
- export RADV_FORCE_FAMILY="polaris10"
- - ./artifacts/fossilize-runner.sh
- - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./artifacts/fossilize-runner.sh
+ - ./install/fossilize-runner.sh
+ - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh
# Vega10
- export RADV_FORCE_FAMILY="gfx900"
- - ./artifacts/fossilize-runner.sh
- - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./artifacts/fossilize-runner.sh
+ - ./install/fossilize-runner.sh
+ - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh
# Navi10
- export RADV_FORCE_FAMILY="gfx1010"
- - ./artifacts/fossilize-runner.sh
- - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./artifacts/fossilize-runner.sh
+ - ./install/fossilize-runner.sh
+ - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh
# Traces CI
.traces-test:
@@ -835,14 +835,14 @@ radv-fossils:
- .test-gl
- .traces-test
script:
- - ./artifacts/tracie-runner-gl.sh
+ - ./install/tracie-runner-gl.sh
.traces-test-vk:
extends:
- .test-vk
- .traces-test
script:
- - ./artifacts/tracie-runner-vk.sh
+ - ./install/tracie-runner-vk.sh
llvmpipe-traces:
extends: