diff --git a/src/amd/ci/deqp-radv-raven.toml b/src/amd/ci/deqp-radv-raven.toml deleted file mode 100644 index 529674dcc5d..00000000000 --- a/src/amd/ci/deqp-radv-raven.toml +++ /dev/null @@ -1,6 +0,0 @@ -# Basic test set -[[deqp]] -deqp = "/deqp-vk-main/external/vulkancts/modules/vulkan/deqp-vk" -caselists = ["/deqp-vk-main/mustpass/vk-main.txt"] -tests_per_group = 5000 -renderer_check = "RADV RAVEN" diff --git a/src/amd/ci/deqp-radv-stoney.toml b/src/amd/ci/deqp-radv-stoney.toml deleted file mode 100644 index 3e081832fde..00000000000 --- a/src/amd/ci/deqp-radv-stoney.toml +++ /dev/null @@ -1,6 +0,0 @@ -# Basic test set -[[deqp]] -deqp = "/deqp-vk-main/external/vulkancts/modules/vulkan/deqp-vk" -caselists = ["/deqp-vk-main/mustpass/vk-main.txt"] -tests_per_group = 5000 -renderer_check = "RADV STONEY" diff --git a/src/amd/ci/deqp-radv-valve.toml b/src/amd/ci/deqp-radv.toml similarity index 100% rename from src/amd/ci/deqp-radv-valve.toml rename to src/amd/ci/deqp-radv.toml diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index b4750abb7d4..50231dab579 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -357,7 +357,7 @@ - .radv-valve-rules - .ci-tron-test-radv variables: - DEQP_SUITE: radv-valve + DEQP_SUITE: radv .tahiti-test-valve: diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 14a3745ddd3..b1a6a54114e 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -8,7 +8,7 @@ radv-stoney-vkcts: - .radv-stoney-test:x86_64 parallel: 5 variables: - DEQP_SUITE: radv-stoney + DEQP_SUITE: radv DEQP_FRACTION: 18 radv-stoney-angle: @@ -56,7 +56,7 @@ radv-raven-vkcts: - .lava-asus-CM1400CXA-dalboz:x86_64 parallel: 9 variables: - DEQP_SUITE: radv-raven + DEQP_SUITE: radv DEQP_FRACTION: 6 amd-raven-skqp: