diff --git a/src/freedreno/ci/deqp-freedreno-a750-piglit-cl.toml b/src/freedreno/ci/deqp-freedreno-a750-piglit-cl.toml deleted file mode 100644 index 776e6edd737..00000000000 --- a/src/freedreno/ci/deqp-freedreno-a750-piglit-cl.toml +++ /dev/null @@ -1,8 +0,0 @@ -[[piglit]] -piglit_folder = "/piglit" -profile = "cl" -process_isolation = true -skips = ["install/freedreno-a6xx-skips.txt"] - [piglit.env] - RUSTICL_ENABLE = "msm" - diff --git a/src/freedreno/ci/deqp-freedreno-a750.toml b/src/freedreno/ci/deqp-freedreno-a750.toml index c428a097f36..3baed41e23e 100644 --- a/src/freedreno/ci/deqp-freedreno-a750.toml +++ b/src/freedreno/ci/deqp-freedreno-a750.toml @@ -59,3 +59,11 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] + +[[piglit]] +piglit_folder = "/piglit" +profile = "cl" +process_isolation = true +skips = ["install/freedreno-a6xx-skips.txt"] + [piglit.env] + RUSTICL_ENABLE = "msm" diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 93976f1c928..b3128d71e7e 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -437,18 +437,7 @@ a750-angle: DEQP_SUITE: tu-angle HWCI_TEST_SCRIPT: ./install/deqp-runner.sh -a750-gl: - extends: - - .ci-tron-arm64-test-gl - - .a750-mupuf - - .valve-freedreno-manual-rules - timeout: 30m # base runtime 11min total, 8min of testing - variables: - CI_TRON_TIMEOUT__OVERALL__MINUTES: 25 - HWCI_TEST_SCRIPT: install/deqp-runner.sh - DEQP_SUITE: freedreno-a750 - -a750-piglit-cl: +a750-gl-cl: extends: - .ci-tron-arm64-test-gl - .test-piglit @@ -457,11 +446,12 @@ a750-piglit-cl: rules: - !reference [.valve-freedreno-manual-rules, rules] - !reference [.rusticl-manual-rules, rules] + timeout: 30m # base runtime 11min total, 8min of testing variables: - DEQP_SUITE: freedreno-a750-piglit-cl + CI_TRON_TIMEOUT__OVERALL__MINUTES: 25 HWCI_START_WESTON: 1 - HWCI_TEST_SCRIPT: ./install/deqp-runner.sh - VK_DRIVER: freedreno + HWCI_TEST_SCRIPT: install/deqp-runner.sh + DEQP_SUITE: freedreno-a750 a750-vk: extends: