diff options
| author | Jesse Natalie <jenatali@microsoft.com> | 2023-01-25 17:08:26 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-01-27 01:49:19 +0000 |
| commit | 1c5a64296d5b4fdec34ccb35098601e1896ee1a2 (patch) | |
| tree | bce28e6aadab29a475fa3805422ece327ea17867 | |
| parent | 2ae08c3e8fc7a735b24aecaeb648aee4ccba6390 (diff) | |
| download | mesa-1c5a64296d5b4fdec34ccb35098601e1896ee1a2.tar.gz mesa-1c5a64296d5b4fdec34ccb35098601e1896ee1a2.tar.bz2 mesa-1c5a64296d5b4fdec34ccb35098601e1896ee1a2.zip | |
CI/windows: Don't limit deqp-runner to 4 jobs
If FDO_CI_CONCURRENT is set, use that, otherwise let deqp-runner
choose concurrency based on system CPU cores.
Reviewed-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20924>
| -rw-r--r-- | .gitlab-ci/windows/deqp_runner_run.ps1 | 7 | ||||
| -rw-r--r-- | src/microsoft/ci/warp-flakes.txt | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci/windows/deqp_runner_run.ps1 b/.gitlab-ci/windows/deqp_runner_run.ps1 index 4bf0f619ffa..efdf619cf2f 100644 --- a/.gitlab-ci/windows/deqp_runner_run.ps1 +++ b/.gitlab-ci/windows/deqp_runner_run.ps1 @@ -9,9 +9,14 @@ $results = New-Item -ItemType Directory results $baseline = ".\_install\warp-fails.txt" $suite = ".\_install\deqp-dozen.toml" +$jobs = "" +if ($null -ne $env:FDO_CI_CONCURRENT) { + $jobs = "--jobs", "$($env:FDO_CI_CONCURRENT)" +} + $env:DZN_DEBUG = "warp" $env:MESA_VK_IGNORE_CONFORMANCE_WARNING = "true" -deqp-runner suite --suite $($suite) --output $($results) --baseline $($baseline) --testlog-to-xml C:\deqp\executor\testlog-to-xml.exe --jobs 4 --fraction 3 +deqp-runner suite --suite $($suite) --output $($results) --baseline $($baseline) --testlog-to-xml C:\deqp\executor\testlog-to-xml.exe $jobs --fraction 3 $deqpstatus = $? $template = "See https://$($env:CI_PROJECT_ROOT_NAMESPACE).pages.freedesktop.org/-/$($env:CI_PROJECT_NAME)/-/jobs/$($env:CI_JOB_ID)/artifacts/results/{{testcase}}.xml" diff --git a/src/microsoft/ci/warp-flakes.txt b/src/microsoft/ci/warp-flakes.txt index ec20364ff1b..45ed598a0f4 100644 --- a/src/microsoft/ci/warp-flakes.txt +++ b/src/microsoft/ci/warp-flakes.txt @@ -1 +1,2 @@ dEQP-VK.query_pool.concurrent_queries.primary_command_buffer +dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap |