Module: Mesa Branch: main Commit: a5de0174af1d185dbcde7409055be7c48973d936 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5de0174af1d185dbcde7409055be7c48973d936
Author: Guilherme Gallo <[email protected]> Date: Mon Mar 27 16:17:51 2023 -0300 ci/zink: Fix zink-tu-a618-traces perf job rules The pipeline should create this job only when it is under performance enabled workflow, represented by the presence of MESA_CI_PERFORMANCE_ENABLED variable. For example: The following pipeline https://gitlab.freedesktop.org/gallo/mesa/-/pipelines/840525 has `zink-tu-a618-traces-performance` job, even if it was not triggered by marge-bot, which means that performance jobs should be disabled. This job should appear in pipelines with performance jobs enabled https://gitlab.freedesktop.org/gallo/mesa/-/pipelines/840529 Fixes: 93e3d37b47c77b19b330e3d5c6d2440108636952 Signed-off-by: Guilherme Gallo <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22155> --- .gitlab-ci/test-source-dep.yml | 3 ++- src/gallium/drivers/zink/ci/gitlab-ci.yml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 9103c321f98..60ee771a478 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -83,7 +83,8 @@ allow_failure: true .piglit-performance-base: - allow_failure: true + extends: + - .performance-rules variables: LAVA_JOB_PRIORITY: 40 PIGLIT_REPLAY_SUBCOMMAND: "profile" diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index 9c4a8e863b2..69ef78aeab7 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -130,6 +130,9 @@ zink-tu-a618-traces-performance: - zink-tu-a618-traces - .zink-turnip-manual-rules - .piglit-performance:arm64 + rules: + - !reference [.piglit-performance:arm64, rules] + - !reference [.zink-turnip-manual-rules, rules] variables: # Always use the same device # a618 tag starts with cbg-1 (not cbg-0) for some reason
