diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index edceeaa008f..cb8c57e3507 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -408,7 +408,7 @@ # Unfortunately YAML doesn't let us concatenate arrays, so we have to do the # rules duplication manually -.virgl-lava-rules-performance: +.virgl-iris-rules-performance: stage: layered-backends rules: - *ignore_scheduled_pipelines @@ -592,7 +592,7 @@ - if: '$MICROSOFT_FARM == "offline"' when: never - *ignore_scheduled_pipelines - - changes: + - changes: *mesa_core_file_list when: on_success - changes: diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index 7ee5292844f..eddeeb30fa1 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -66,7 +66,7 @@ virgl-traces: # 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 -.virgl-lava-test: +.virgl-iris-test: extends: - .lava-piglit-traces:amd64 variables: @@ -82,21 +82,21 @@ virgl-traces: CROSVM_GPU_ARGS: "gles=false,backend=virglrenderer,egl=true,surfaceless=true,width=1024,height=768" EGL_PLATFORM: surfaceless 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 -virgl-lava-traces: +virgl-iris-traces: extends: - - .virgl-lava-test + - .virgl-iris-test - .virgl-rules - .test-manual-mr variables: PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image --download-caching-proxy-url=${FDO_HTTP_CACHE_URI}" -virgl-lava-traces-performance: +virgl-iris-traces-performance: extends: - - .virgl-lava-test - - .virgl-lava-rules-performance + - .virgl-iris-test + - .virgl-iris-rules-performance variables: HWCI_FREQ_MAX: "true" PIGLIT_REPLAY_SUBCOMMAND: profile diff --git a/src/gallium/drivers/virgl/ci/traces-virgl-lava.yml b/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml similarity index 100% rename from src/gallium/drivers/virgl/ci/traces-virgl-lava.yml rename to src/gallium/drivers/virgl/ci/traces-virgl-iris.yml