From 6d2afe1c83254c4cf437e14a221087ecc01cc7d1 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 27 Jan 2021 16:36:14 +0100 Subject: [PATCH] ci: Move out expect files from .gitlab-ci This way, when such a file is modified only the affected driver gets tested. It also helps to declutter the .gitlab-ci directory. Signed-off-by: Tomeu Vizoso Reviewed-by: Rohan Garg Part-of: --- .gitlab-ci/prepare-artifacts.sh | 4 +--- .gitlab-ci/test-source-dep.yml | 8 ++++++++ {.gitlab-ci => ci-expects/default}/deqp-default-skips.txt | 0 .../freedreno}/deqp-freedreno-a307-fails.txt | 0 .../freedreno}/deqp-freedreno-a307-flakes.txt | 0 .../freedreno}/deqp-freedreno-a530-fails.txt | 0 .../freedreno}/deqp-freedreno-a530-flakes.txt | 0 .../freedreno}/deqp-freedreno-a630-bypass-fails.txt | 0 .../freedreno}/deqp-freedreno-a630-bypass-flakes.txt | 0 .../freedreno}/deqp-freedreno-a630-fails.txt | 0 .../freedreno}/deqp-freedreno-a630-flakes.txt | 0 .../freedreno}/deqp-freedreno-a630-skips.txt | 0 {.gitlab-ci => ci-expects/freedreno}/traces-freedreno.yml | 0 {.gitlab-ci => ci-expects/lima}/deqp-lima-fails.txt | 0 {.gitlab-ci => ci-expects/lima}/deqp-lima-skips.txt | 0 .../llvmpipe}/deqp-llvmpipe-fails.txt | 0 {.gitlab-ci => ci-expects/llvmpipe}/traces-llvmpipe.yml | 0 {.gitlab-ci => ci-expects/lvp}/deqp-lvp-fails.txt | 0 {.gitlab-ci => ci-expects/lvp}/deqp-lvp-flakes.txt | 0 {.gitlab-ci => ci-expects/lvp}/deqp-lvp-skips.txt | 0 .../panfrost}/deqp-panfrost-g52-fails.txt | 0 .../panfrost}/deqp-panfrost-g52-flakes.txt | 0 .../panfrost}/deqp-panfrost-g52-skips.txt | 0 .../panfrost}/deqp-panfrost-t720-fails.txt | 0 .../panfrost}/deqp-panfrost-t720-flakes.txt | 0 .../panfrost}/deqp-panfrost-t720-skips.txt | 0 .../panfrost}/deqp-panfrost-t760-fails.txt | 0 .../panfrost}/deqp-panfrost-t760-skips.txt | 0 .../panfrost}/deqp-panfrost-t820-fails.txt | 0 .../panfrost}/deqp-panfrost-t820-skips.txt | 0 .../panfrost}/deqp-panfrost-t860-fails.txt | 0 .../panfrost}/deqp-panfrost-t860-flakes.txt | 0 .../panfrost}/deqp-panfrost-t860-skips.txt | 0 {.gitlab-ci => ci-expects/panfrost}/traces-panfrost.yml | 0 .../radeonsi}/deqp-radeonsi-stoney-fails.txt | 0 .../radeonsi}/deqp-radeonsi-stoney-skips.txt | 0 {.gitlab-ci => ci-expects/radeonsi}/traces-radeonsi.yml | 0 .../radv}/deqp-radv-default-skips.txt | 0 .../radv}/deqp-radv-fiji-aco-fails.txt | 0 .../radv}/deqp-radv-navi10-aco-fails.txt | 0 .../radv}/deqp-radv-navi14-aco-fails.txt | 0 .../radv}/deqp-radv-oland-aco-fails.txt | 0 .../radv}/deqp-radv-pitcairn-aco-fails.txt | 0 .../radv}/deqp-radv-polaris10-aco-fails.txt | 0 .../radv}/deqp-radv-polaris10-skips.txt | 0 .../radv}/deqp-radv-raven-aco-fails.txt | 0 .../radv}/deqp-radv-raven-aco-skips.txt | 0 .../radv}/deqp-radv-sienna_cichlid-aco-fails.txt | 0 .../radv}/deqp-radv-vega10-aco-fails.txt | 0 {.gitlab-ci => ci-expects/radv}/traces-radv.yml | 0 .../softpipe}/deqp-softpipe-asan-fails.txt | 0 .../softpipe}/deqp-softpipe-fails.txt | 0 .../softpipe}/deqp-softpipe-flakes.txt | 0 .../softpipe}/deqp-softpipe-skips.txt | 0 {.gitlab-ci => ci-expects/vc4}/deqp-vc4-rpi3-fails.txt | 0 {.gitlab-ci => ci-expects/vc4}/deqp-vc4-rpi3-flakes.txt | 0 {.gitlab-ci => ci-expects/vc4}/deqp-vc4-rpi3-skips.txt | 0 {.gitlab-ci => ci-expects/virgl}/deqp-virgl-gl-fails.txt | 0 {.gitlab-ci => ci-expects/virgl}/deqp-virgl-gl-skips.txt | 0 .../virgl}/deqp-virgl-gles-fails.txt | 0 {.gitlab-ci => ci-expects/virgl}/traces-virgl.yml | 0 61 files changed, 9 insertions(+), 3 deletions(-) rename {.gitlab-ci => ci-expects/default}/deqp-default-skips.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a307-fails.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a307-flakes.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a530-fails.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a530-flakes.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a630-bypass-fails.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a630-bypass-flakes.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a630-fails.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a630-flakes.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/deqp-freedreno-a630-skips.txt (100%) rename {.gitlab-ci => ci-expects/freedreno}/traces-freedreno.yml (100%) rename {.gitlab-ci => ci-expects/lima}/deqp-lima-fails.txt (100%) rename {.gitlab-ci => ci-expects/lima}/deqp-lima-skips.txt (100%) rename {.gitlab-ci => ci-expects/llvmpipe}/deqp-llvmpipe-fails.txt (100%) rename {.gitlab-ci => ci-expects/llvmpipe}/traces-llvmpipe.yml (100%) rename {.gitlab-ci => ci-expects/lvp}/deqp-lvp-fails.txt (100%) rename {.gitlab-ci => ci-expects/lvp}/deqp-lvp-flakes.txt (100%) rename {.gitlab-ci => ci-expects/lvp}/deqp-lvp-skips.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-g52-fails.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-g52-flakes.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-g52-skips.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t720-fails.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t720-flakes.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t720-skips.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t760-fails.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t760-skips.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t820-fails.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t820-skips.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t860-fails.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t860-flakes.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/deqp-panfrost-t860-skips.txt (100%) rename {.gitlab-ci => ci-expects/panfrost}/traces-panfrost.yml (100%) rename {.gitlab-ci => ci-expects/radeonsi}/deqp-radeonsi-stoney-fails.txt (100%) rename {.gitlab-ci => ci-expects/radeonsi}/deqp-radeonsi-stoney-skips.txt (100%) rename {.gitlab-ci => ci-expects/radeonsi}/traces-radeonsi.yml (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-default-skips.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-fiji-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-navi10-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-navi14-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-oland-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-pitcairn-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-polaris10-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-polaris10-skips.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-raven-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-raven-aco-skips.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-sienna_cichlid-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/deqp-radv-vega10-aco-fails.txt (100%) rename {.gitlab-ci => ci-expects/radv}/traces-radv.yml (100%) rename {.gitlab-ci => ci-expects/softpipe}/deqp-softpipe-asan-fails.txt (100%) rename {.gitlab-ci => ci-expects/softpipe}/deqp-softpipe-fails.txt (100%) rename {.gitlab-ci => ci-expects/softpipe}/deqp-softpipe-flakes.txt (100%) rename {.gitlab-ci => ci-expects/softpipe}/deqp-softpipe-skips.txt (100%) rename {.gitlab-ci => ci-expects/vc4}/deqp-vc4-rpi3-fails.txt (100%) rename {.gitlab-ci => ci-expects/vc4}/deqp-vc4-rpi3-flakes.txt (100%) rename {.gitlab-ci => ci-expects/vc4}/deqp-vc4-rpi3-skips.txt (100%) rename {.gitlab-ci => ci-expects/virgl}/deqp-virgl-gl-fails.txt (100%) rename {.gitlab-ci => ci-expects/virgl}/deqp-virgl-gl-skips.txt (100%) rename {.gitlab-ci => ci-expects/virgl}/deqp-virgl-gles-fails.txt (100%) rename {.gitlab-ci => ci-expects/virgl}/traces-virgl.yml (100%) diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh index edbfa599f53..839c441be08 100755 --- a/.gitlab-ci/prepare-artifacts.sh +++ b/.gitlab-ci/prepare-artifacts.sh @@ -26,14 +26,12 @@ fi # script and associated bits there. echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" >> install/VERSION cp -Rp .gitlab-ci/bare-metal install/ -cp -Rp .gitlab-ci/deqp* install/ cp -Rp .gitlab-ci/piglit install/ -cp -Rp .gitlab-ci/traces*.yml install/ cp -Rp .gitlab-ci/fossils.yml install/ cp -Rp .gitlab-ci/fossils install/ cp -Rp .gitlab-ci/fossilize-runner.sh install/ cp -Rp .gitlab-ci/deqp-runner.sh install/ -cp -Rp .gitlab-ci/deqp-*.txt install/ +cp -Rp ci-expects/*/* install/ # Tar up the install dir so that symlinks and hardlinks aren't each # packed separately in the zip file. diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 6b37d99b8b8..dbe31975e5f 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -94,6 +94,7 @@ - src/gallium/drivers/llvmpipe/**/* - src/gallium/frontends/lavapipe/**/* - src/gallium/winsys/sw/**/* + - ci-expects/llvmpipe/* when: on_success - when: never @@ -146,6 +147,7 @@ - src/freedreno/vulkan/**/* - src/gallium/drivers/freedreno/**/* - src/gallium/winsys/freedreno/**/* + - ci-expects/freedreno/* when: on_success - when: never @@ -163,6 +165,7 @@ - src/gallium/drivers/panfrost/**/* - src/gallium/winsys/panfrost/**/* - src/panfrost/**/* + - ci-expects/panfrost/* when: on_success - when: never @@ -181,6 +184,7 @@ - src/gallium/drivers/vc4/**/* - src/gallium/winsys/kmsro/**/* - src/gallium/winsys/vc4/**/* + - ci-expects/vc4/* when: on_success - when: never @@ -198,6 +202,7 @@ - src/gallium/drivers/lima/**/* - src/gallium/winsys/lima/**/* - src/lima/**/* + - ci-expects/lima/* when: on_success - when: never @@ -210,6 +215,7 @@ - changes: - src/amd/**/* - src/vulkan/**/* + - ci-expects/radv/* when: on_success - when: never @@ -229,6 +235,7 @@ - changes: - src/gallium/drivers/virgl/**/* - src/gallium/winsys/virgl/**/* + - ci-expects/virgl/* when: on_success - when: never @@ -250,6 +257,7 @@ - src/amd/common/**/* - src/amd/llvm/**/* - src/amd/registers/**/* + - ci-expects/radeonsi/* when: on_success - when: never diff --git a/.gitlab-ci/deqp-default-skips.txt b/ci-expects/default/deqp-default-skips.txt similarity index 100% rename from .gitlab-ci/deqp-default-skips.txt rename to ci-expects/default/deqp-default-skips.txt diff --git a/.gitlab-ci/deqp-freedreno-a307-fails.txt b/ci-expects/freedreno/deqp-freedreno-a307-fails.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a307-fails.txt rename to ci-expects/freedreno/deqp-freedreno-a307-fails.txt diff --git a/.gitlab-ci/deqp-freedreno-a307-flakes.txt b/ci-expects/freedreno/deqp-freedreno-a307-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a307-flakes.txt rename to ci-expects/freedreno/deqp-freedreno-a307-flakes.txt diff --git a/.gitlab-ci/deqp-freedreno-a530-fails.txt b/ci-expects/freedreno/deqp-freedreno-a530-fails.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a530-fails.txt rename to ci-expects/freedreno/deqp-freedreno-a530-fails.txt diff --git a/.gitlab-ci/deqp-freedreno-a530-flakes.txt b/ci-expects/freedreno/deqp-freedreno-a530-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a530-flakes.txt rename to ci-expects/freedreno/deqp-freedreno-a530-flakes.txt diff --git a/.gitlab-ci/deqp-freedreno-a630-bypass-fails.txt b/ci-expects/freedreno/deqp-freedreno-a630-bypass-fails.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a630-bypass-fails.txt rename to ci-expects/freedreno/deqp-freedreno-a630-bypass-fails.txt diff --git a/.gitlab-ci/deqp-freedreno-a630-bypass-flakes.txt b/ci-expects/freedreno/deqp-freedreno-a630-bypass-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a630-bypass-flakes.txt rename to ci-expects/freedreno/deqp-freedreno-a630-bypass-flakes.txt diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/ci-expects/freedreno/deqp-freedreno-a630-fails.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a630-fails.txt rename to ci-expects/freedreno/deqp-freedreno-a630-fails.txt diff --git a/.gitlab-ci/deqp-freedreno-a630-flakes.txt b/ci-expects/freedreno/deqp-freedreno-a630-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a630-flakes.txt rename to ci-expects/freedreno/deqp-freedreno-a630-flakes.txt diff --git a/.gitlab-ci/deqp-freedreno-a630-skips.txt b/ci-expects/freedreno/deqp-freedreno-a630-skips.txt similarity index 100% rename from .gitlab-ci/deqp-freedreno-a630-skips.txt rename to ci-expects/freedreno/deqp-freedreno-a630-skips.txt diff --git a/.gitlab-ci/traces-freedreno.yml b/ci-expects/freedreno/traces-freedreno.yml similarity index 100% rename from .gitlab-ci/traces-freedreno.yml rename to ci-expects/freedreno/traces-freedreno.yml diff --git a/.gitlab-ci/deqp-lima-fails.txt b/ci-expects/lima/deqp-lima-fails.txt similarity index 100% rename from .gitlab-ci/deqp-lima-fails.txt rename to ci-expects/lima/deqp-lima-fails.txt diff --git a/.gitlab-ci/deqp-lima-skips.txt b/ci-expects/lima/deqp-lima-skips.txt similarity index 100% rename from .gitlab-ci/deqp-lima-skips.txt rename to ci-expects/lima/deqp-lima-skips.txt diff --git a/.gitlab-ci/deqp-llvmpipe-fails.txt b/ci-expects/llvmpipe/deqp-llvmpipe-fails.txt similarity index 100% rename from .gitlab-ci/deqp-llvmpipe-fails.txt rename to ci-expects/llvmpipe/deqp-llvmpipe-fails.txt diff --git a/.gitlab-ci/traces-llvmpipe.yml b/ci-expects/llvmpipe/traces-llvmpipe.yml similarity index 100% rename from .gitlab-ci/traces-llvmpipe.yml rename to ci-expects/llvmpipe/traces-llvmpipe.yml diff --git a/.gitlab-ci/deqp-lvp-fails.txt b/ci-expects/lvp/deqp-lvp-fails.txt similarity index 100% rename from .gitlab-ci/deqp-lvp-fails.txt rename to ci-expects/lvp/deqp-lvp-fails.txt diff --git a/.gitlab-ci/deqp-lvp-flakes.txt b/ci-expects/lvp/deqp-lvp-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-lvp-flakes.txt rename to ci-expects/lvp/deqp-lvp-flakes.txt diff --git a/.gitlab-ci/deqp-lvp-skips.txt b/ci-expects/lvp/deqp-lvp-skips.txt similarity index 100% rename from .gitlab-ci/deqp-lvp-skips.txt rename to ci-expects/lvp/deqp-lvp-skips.txt diff --git a/.gitlab-ci/deqp-panfrost-g52-fails.txt b/ci-expects/panfrost/deqp-panfrost-g52-fails.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-g52-fails.txt rename to ci-expects/panfrost/deqp-panfrost-g52-fails.txt diff --git a/.gitlab-ci/deqp-panfrost-g52-flakes.txt b/ci-expects/panfrost/deqp-panfrost-g52-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-g52-flakes.txt rename to ci-expects/panfrost/deqp-panfrost-g52-flakes.txt diff --git a/.gitlab-ci/deqp-panfrost-g52-skips.txt b/ci-expects/panfrost/deqp-panfrost-g52-skips.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-g52-skips.txt rename to ci-expects/panfrost/deqp-panfrost-g52-skips.txt diff --git a/.gitlab-ci/deqp-panfrost-t720-fails.txt b/ci-expects/panfrost/deqp-panfrost-t720-fails.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t720-fails.txt rename to ci-expects/panfrost/deqp-panfrost-t720-fails.txt diff --git a/.gitlab-ci/deqp-panfrost-t720-flakes.txt b/ci-expects/panfrost/deqp-panfrost-t720-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t720-flakes.txt rename to ci-expects/panfrost/deqp-panfrost-t720-flakes.txt diff --git a/.gitlab-ci/deqp-panfrost-t720-skips.txt b/ci-expects/panfrost/deqp-panfrost-t720-skips.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t720-skips.txt rename to ci-expects/panfrost/deqp-panfrost-t720-skips.txt diff --git a/.gitlab-ci/deqp-panfrost-t760-fails.txt b/ci-expects/panfrost/deqp-panfrost-t760-fails.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t760-fails.txt rename to ci-expects/panfrost/deqp-panfrost-t760-fails.txt diff --git a/.gitlab-ci/deqp-panfrost-t760-skips.txt b/ci-expects/panfrost/deqp-panfrost-t760-skips.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t760-skips.txt rename to ci-expects/panfrost/deqp-panfrost-t760-skips.txt diff --git a/.gitlab-ci/deqp-panfrost-t820-fails.txt b/ci-expects/panfrost/deqp-panfrost-t820-fails.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t820-fails.txt rename to ci-expects/panfrost/deqp-panfrost-t820-fails.txt diff --git a/.gitlab-ci/deqp-panfrost-t820-skips.txt b/ci-expects/panfrost/deqp-panfrost-t820-skips.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t820-skips.txt rename to ci-expects/panfrost/deqp-panfrost-t820-skips.txt diff --git a/.gitlab-ci/deqp-panfrost-t860-fails.txt b/ci-expects/panfrost/deqp-panfrost-t860-fails.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t860-fails.txt rename to ci-expects/panfrost/deqp-panfrost-t860-fails.txt diff --git a/.gitlab-ci/deqp-panfrost-t860-flakes.txt b/ci-expects/panfrost/deqp-panfrost-t860-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t860-flakes.txt rename to ci-expects/panfrost/deqp-panfrost-t860-flakes.txt diff --git a/.gitlab-ci/deqp-panfrost-t860-skips.txt b/ci-expects/panfrost/deqp-panfrost-t860-skips.txt similarity index 100% rename from .gitlab-ci/deqp-panfrost-t860-skips.txt rename to ci-expects/panfrost/deqp-panfrost-t860-skips.txt diff --git a/.gitlab-ci/traces-panfrost.yml b/ci-expects/panfrost/traces-panfrost.yml similarity index 100% rename from .gitlab-ci/traces-panfrost.yml rename to ci-expects/panfrost/traces-panfrost.yml diff --git a/.gitlab-ci/deqp-radeonsi-stoney-fails.txt b/ci-expects/radeonsi/deqp-radeonsi-stoney-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radeonsi-stoney-fails.txt rename to ci-expects/radeonsi/deqp-radeonsi-stoney-fails.txt diff --git a/.gitlab-ci/deqp-radeonsi-stoney-skips.txt b/ci-expects/radeonsi/deqp-radeonsi-stoney-skips.txt similarity index 100% rename from .gitlab-ci/deqp-radeonsi-stoney-skips.txt rename to ci-expects/radeonsi/deqp-radeonsi-stoney-skips.txt diff --git a/.gitlab-ci/traces-radeonsi.yml b/ci-expects/radeonsi/traces-radeonsi.yml similarity index 100% rename from .gitlab-ci/traces-radeonsi.yml rename to ci-expects/radeonsi/traces-radeonsi.yml diff --git a/.gitlab-ci/deqp-radv-default-skips.txt b/ci-expects/radv/deqp-radv-default-skips.txt similarity index 100% rename from .gitlab-ci/deqp-radv-default-skips.txt rename to ci-expects/radv/deqp-radv-default-skips.txt diff --git a/.gitlab-ci/deqp-radv-fiji-aco-fails.txt b/ci-expects/radv/deqp-radv-fiji-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-fiji-aco-fails.txt rename to ci-expects/radv/deqp-radv-fiji-aco-fails.txt diff --git a/.gitlab-ci/deqp-radv-navi10-aco-fails.txt b/ci-expects/radv/deqp-radv-navi10-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-navi10-aco-fails.txt rename to ci-expects/radv/deqp-radv-navi10-aco-fails.txt diff --git a/.gitlab-ci/deqp-radv-navi14-aco-fails.txt b/ci-expects/radv/deqp-radv-navi14-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-navi14-aco-fails.txt rename to ci-expects/radv/deqp-radv-navi14-aco-fails.txt diff --git a/.gitlab-ci/deqp-radv-oland-aco-fails.txt b/ci-expects/radv/deqp-radv-oland-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-oland-aco-fails.txt rename to ci-expects/radv/deqp-radv-oland-aco-fails.txt diff --git a/.gitlab-ci/deqp-radv-pitcairn-aco-fails.txt b/ci-expects/radv/deqp-radv-pitcairn-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-pitcairn-aco-fails.txt rename to ci-expects/radv/deqp-radv-pitcairn-aco-fails.txt diff --git a/.gitlab-ci/deqp-radv-polaris10-aco-fails.txt b/ci-expects/radv/deqp-radv-polaris10-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-polaris10-aco-fails.txt rename to ci-expects/radv/deqp-radv-polaris10-aco-fails.txt diff --git a/.gitlab-ci/deqp-radv-polaris10-skips.txt b/ci-expects/radv/deqp-radv-polaris10-skips.txt similarity index 100% rename from .gitlab-ci/deqp-radv-polaris10-skips.txt rename to ci-expects/radv/deqp-radv-polaris10-skips.txt diff --git a/.gitlab-ci/deqp-radv-raven-aco-fails.txt b/ci-expects/radv/deqp-radv-raven-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-raven-aco-fails.txt rename to ci-expects/radv/deqp-radv-raven-aco-fails.txt diff --git a/.gitlab-ci/deqp-radv-raven-aco-skips.txt b/ci-expects/radv/deqp-radv-raven-aco-skips.txt similarity index 100% rename from .gitlab-ci/deqp-radv-raven-aco-skips.txt rename to ci-expects/radv/deqp-radv-raven-aco-skips.txt diff --git a/.gitlab-ci/deqp-radv-sienna_cichlid-aco-fails.txt b/ci-expects/radv/deqp-radv-sienna_cichlid-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-sienna_cichlid-aco-fails.txt rename to ci-expects/radv/deqp-radv-sienna_cichlid-aco-fails.txt diff --git a/.gitlab-ci/deqp-radv-vega10-aco-fails.txt b/ci-expects/radv/deqp-radv-vega10-aco-fails.txt similarity index 100% rename from .gitlab-ci/deqp-radv-vega10-aco-fails.txt rename to ci-expects/radv/deqp-radv-vega10-aco-fails.txt diff --git a/.gitlab-ci/traces-radv.yml b/ci-expects/radv/traces-radv.yml similarity index 100% rename from .gitlab-ci/traces-radv.yml rename to ci-expects/radv/traces-radv.yml diff --git a/.gitlab-ci/deqp-softpipe-asan-fails.txt b/ci-expects/softpipe/deqp-softpipe-asan-fails.txt similarity index 100% rename from .gitlab-ci/deqp-softpipe-asan-fails.txt rename to ci-expects/softpipe/deqp-softpipe-asan-fails.txt diff --git a/.gitlab-ci/deqp-softpipe-fails.txt b/ci-expects/softpipe/deqp-softpipe-fails.txt similarity index 100% rename from .gitlab-ci/deqp-softpipe-fails.txt rename to ci-expects/softpipe/deqp-softpipe-fails.txt diff --git a/.gitlab-ci/deqp-softpipe-flakes.txt b/ci-expects/softpipe/deqp-softpipe-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-softpipe-flakes.txt rename to ci-expects/softpipe/deqp-softpipe-flakes.txt diff --git a/.gitlab-ci/deqp-softpipe-skips.txt b/ci-expects/softpipe/deqp-softpipe-skips.txt similarity index 100% rename from .gitlab-ci/deqp-softpipe-skips.txt rename to ci-expects/softpipe/deqp-softpipe-skips.txt diff --git a/.gitlab-ci/deqp-vc4-rpi3-fails.txt b/ci-expects/vc4/deqp-vc4-rpi3-fails.txt similarity index 100% rename from .gitlab-ci/deqp-vc4-rpi3-fails.txt rename to ci-expects/vc4/deqp-vc4-rpi3-fails.txt diff --git a/.gitlab-ci/deqp-vc4-rpi3-flakes.txt b/ci-expects/vc4/deqp-vc4-rpi3-flakes.txt similarity index 100% rename from .gitlab-ci/deqp-vc4-rpi3-flakes.txt rename to ci-expects/vc4/deqp-vc4-rpi3-flakes.txt diff --git a/.gitlab-ci/deqp-vc4-rpi3-skips.txt b/ci-expects/vc4/deqp-vc4-rpi3-skips.txt similarity index 100% rename from .gitlab-ci/deqp-vc4-rpi3-skips.txt rename to ci-expects/vc4/deqp-vc4-rpi3-skips.txt diff --git a/.gitlab-ci/deqp-virgl-gl-fails.txt b/ci-expects/virgl/deqp-virgl-gl-fails.txt similarity index 100% rename from .gitlab-ci/deqp-virgl-gl-fails.txt rename to ci-expects/virgl/deqp-virgl-gl-fails.txt diff --git a/.gitlab-ci/deqp-virgl-gl-skips.txt b/ci-expects/virgl/deqp-virgl-gl-skips.txt similarity index 100% rename from .gitlab-ci/deqp-virgl-gl-skips.txt rename to ci-expects/virgl/deqp-virgl-gl-skips.txt diff --git a/.gitlab-ci/deqp-virgl-gles-fails.txt b/ci-expects/virgl/deqp-virgl-gles-fails.txt similarity index 100% rename from .gitlab-ci/deqp-virgl-gles-fails.txt rename to ci-expects/virgl/deqp-virgl-gles-fails.txt diff --git a/.gitlab-ci/traces-virgl.yml b/ci-expects/virgl/traces-virgl.yml similarity index 100% rename from .gitlab-ci/traces-virgl.yml rename to ci-expects/virgl/traces-virgl.yml