diff options
| author | Samuel Pitoiset <[email protected]> | 2020-02-26 08:49:27 +0100 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-05 20:33:56 +0000 |
| commit | af1cd4585824e3efc941483d74915903439f27ba (patch) | |
| tree | ab7653db913d69d3c88ff93d100bdb97c0dd9d6b | |
| parent | 1cdb6edbe6dcfa3b0d254dc0f1f31e35be3b10ff (diff) | |
gitlab-ci: enable building the test image for VK unconditionally
It was diabled because RADV is the only driver that tests Vulkan
and running CTS on my personal machine and without recovery is
not safe enough for CI (too long and too unstable).
Now that we are going to test Fossilize with RADV, it's needed to
build the test image for VK unconditionally. As RADV now supports
creating NULL devices, the fossilize jobs can run everywhere.
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3960>
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62cdb24a412..fe282c62970 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,18 +138,6 @@ x86_test-vk: extends: x86_build variables: DEBIAN_TAG: &x86_test-vk "2020-03-05" - # Can only be triggered manually on personal branches because RADV is the only - # driver that does Vulkan testing at the moment. - rules: - # Never build the test image for VK by default in the main project. - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - when: never - # Never build the test image for VK by default for merge requests. - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' - when: never - # Otherwise, allow building it manually for personal branches. - - when: manual - # Debian 9 based x86 build image (old LLVM) x86_build_old: @@ -727,9 +715,8 @@ arm64_a306_gles2: # Never test RADV by default for merge requests. - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' when: never - # Otherwise, allow testing RADV if the test image for VK has been manually - # started. - - when: on_success + # Otherwise, allow testing RADV manually for personal branches. + - when: manual radv_polaris10_vkcts: extends: |