Module: Mesa Branch: main Commit: 5bdb42b1a2663d194d77c3beca0e20441daca38f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bdb42b1a2663d194d77c3beca0e20441daca38f
Author: Eric Engestrom <e...@igalia.com> Date: Fri Nov 10 13:44:36 2023 +0000 zink/ci: run only the relevant jobs when changing the ci expectations Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26258> --- .gitlab-ci/deqp-runner.sh | 5 ++++- src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 5b90b1ff5a3..91965aea45a 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -132,6 +132,9 @@ if [ -n "$VK_DRIVER" ] && [ -z "$DEQP_SUITE" ]; then fi # Set the path to VK validation layer settings (in case it ends up getting loaded) +# Note: If you change the format of this filename, look through the rest of the +# tree for other places that need to be kept in sync (e.g. +# src/gallium/drivers/zink/ci/gitlab-ci-inc.yml) export VK_LAYER_SETTINGS_PATH=$INSTALL/$GPU_VERSION-validation-settings.txt report_load() { @@ -186,7 +189,7 @@ else # If you change the format of the suite toml filenames or the # $GPU_VERSION-{fails,flakes,skips}.txt filenames, look through the rest # of the tree for other places that need to be kept in sync (e.g. - # src/amd/ci/gitlab-ci-inc.yml) + # src/**/ci/gitlab-ci*.yml) deqp-runner \ suite \ --suite $INSTALL/deqp-$DEQP_SUITE.toml \ diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 817c913a86c..c54a6bc7dee 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -5,7 +5,14 @@ - changes: &zink_files_list - src/gallium/drivers/zink/* - src/gallium/drivers/zink/nir_to_spirv/* - - src/gallium/drivers/zink/ci/* + - src/gallium/drivers/zink/ci/gitlab-ci.yml + - src/gallium/drivers/zink/ci/gitlab-ci-inc.yml + - src/gallium/drivers/zink/ci/deqp-$DEQP_SUITE.toml + - src/gallium/drivers/zink/ci/$GPU_VERSION-fails.txt + - src/gallium/drivers/zink/ci/$GPU_VERSION-flakes.txt + - src/gallium/drivers/zink/ci/$GPU_VERSION-skips.txt + - src/gallium/drivers/zink/ci/$GPU_VERSION-validation-settings.txt + - src/gallium/drivers/zink/ci/$PIGLIT_TRACES_FILE when: on_success .zink-common-manual-rules:
