From 87153b8f1c1c85a8eaaed2ab62d500cff4315c92 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Wed, 17 Feb 2021 00:29:20 +0200 Subject: [PATCH] ci: make sure piglit's artifacts are not overwritten The ".test" template defines a generic artifact location to upload and the ".piglit-test" a custom one we don't want to get overwritten by the generic one. Signed-off-by: Andres Gomez Acked-by: Eric Anholt Reviewed-by: Juan A. Suarez Part-of: --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dce22f4..bb63bc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1205,8 +1205,8 @@ zink-piglit-quick_gl: virgl-traces: extends: - - .piglit-traces-test - .virgl-test + - .piglit-traces-test variables: EGL_PLATFORM: "surfaceless" PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-virgl.yml" @@ -1235,9 +1235,8 @@ arm64-a630-traces: radv-polaris10-traces: extends: - - .piglit-traces-test - - .test-vk - .test-radv + - .piglit-traces-test - .test-manual variables: PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-radv.yml" @@ -1248,9 +1247,8 @@ radv-polaris10-traces: radv-raven-traces: extends: - - .piglit-traces-test - - .test-vk - .test-radv + - .piglit-traces-test - .test-manual variables: PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-radv.yml" @@ -1328,8 +1326,8 @@ softpipe-asan-gles31: softpipe-piglit-quick: extends: - - .piglit-test - .test-gl + - .piglit-test - .softpipe-rules variables: GALLIUM_DRIVER: softpipe -- 2.7.4