virgl/ci: Rename virgl-lava-* jobs to virgl-iris-*

Rename 'virgl-lava-*' jobs to a more descriptive 'virgl-iris-*'.

Suggested-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16141>
This commit is contained in:
Cristian Ciocaltea
2022-04-25 12:01:18 +03:00
committed by Marge Bot
parent 4e111c259c
commit 7f8a0010ce
3 changed files with 9 additions and 9 deletions

View File

@@ -408,7 +408,7 @@
# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the # Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
# rules duplication manually # rules duplication manually
.virgl-lava-rules-performance: .virgl-iris-rules-performance:
stage: layered-backends stage: layered-backends
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
@@ -592,7 +592,7 @@
- if: '$MICROSOFT_FARM == "offline"' - if: '$MICROSOFT_FARM == "offline"'
when: never when: never
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
- changes: - changes:

View File

@@ -66,7 +66,7 @@ virgl-traces:
# Couldn't get GitLab CI to correctly substitute the variable in the yaml # Couldn't get GitLab CI to correctly substitute the variable in the yaml
- LP_NUM_THREADS=${FDO_CI_CONCURRENT} FDO_CI_CONCURRENT=1 install/crosvm-runner.sh install/piglit/piglit-traces.sh - LP_NUM_THREADS=${FDO_CI_CONCURRENT} FDO_CI_CONCURRENT=1 install/crosvm-runner.sh install/piglit/piglit-traces.sh
.virgl-lava-test: .virgl-iris-test:
extends: extends:
- .lava-piglit-traces:amd64 - .lava-piglit-traces:amd64
variables: variables:
@@ -82,21 +82,21 @@ virgl-traces:
CROSVM_GPU_ARGS: "gles=false,backend=virglrenderer,egl=true,surfaceless=true,width=1024,height=768" CROSVM_GPU_ARGS: "gles=false,backend=virglrenderer,egl=true,surfaceless=true,width=1024,height=768"
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_PROFILES: replay PIGLIT_PROFILES: replay
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-virgl-lava.yml" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-virgl-iris.yml"
RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer
virgl-lava-traces: virgl-iris-traces:
extends: extends:
- .virgl-lava-test - .virgl-iris-test
- .virgl-rules - .virgl-rules
- .test-manual-mr - .test-manual-mr
variables: variables:
PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image --download-caching-proxy-url=${FDO_HTTP_CACHE_URI}" PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image --download-caching-proxy-url=${FDO_HTTP_CACHE_URI}"
virgl-lava-traces-performance: virgl-iris-traces-performance:
extends: extends:
- .virgl-lava-test - .virgl-iris-test
- .virgl-lava-rules-performance - .virgl-iris-rules-performance
variables: variables:
HWCI_FREQ_MAX: "true" HWCI_FREQ_MAX: "true"
PIGLIT_REPLAY_SUBCOMMAND: profile PIGLIT_REPLAY_SUBCOMMAND: profile