Module: Mesa Branch: main Commit: 90a77f55de62dc777f67ae68aea79048b90d609b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90a77f55de62dc777f67ae68aea79048b90d609b
Author: Eric Engestrom <[email protected]> Date: Wed Nov 1 13:03:49 2023 +0000 ci: drop containers, builds, and tests from post-merge pipeline All these jobs are redundant and a waste of resources: - the containers have already been built & pushed in the merge pipeline - the mesa build variants have already all passed - the driver tests have already all passed None of these jobs are doing anything useful in this pipeline, but it costs a factor of 2x to our infrastructure, so let's remove them. In other words, the only job left in the post-merge pipeline is the `pages` job that deploys the update to the website. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26451> --- .gitlab-ci.yml | 36 +++++----------------- .gitlab-ci/test-source-dep.yml | 4 +++ .gitlab-ci/test/gitlab-ci.yml | 2 ++ src/amd/ci/gitlab-ci-inc.yml | 10 ++++++ src/broadcom/ci/gitlab-ci-inc.yml | 9 ++++-- src/etnaviv/ci/gitlab-ci.yml | 2 ++ src/freedreno/ci/gitlab-ci-inc.yml | 16 ++++++++++ src/gallium/drivers/lima/ci/gitlab-ci.yml | 1 + src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml | 4 +++ src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml | 2 ++ src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml | 1 + src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml | 3 ++ src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 12 +++++++- .../frontends/lavapipe/ci/gitlab-ci-inc.yml | 2 ++ src/intel/ci/gitlab-ci-inc.yml | 13 ++++++++ src/microsoft/ci/gitlab-ci-inc.yml | 5 ++- src/panfrost/ci/gitlab-ci.yml | 4 +++ src/virtio/ci/gitlab-ci.yml | 1 + 18 files changed, 93 insertions(+), 34 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cbbc296bdc..f7025f45a84 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,11 +32,7 @@ workflow: MESA_CI_PERFORMANCE_ENABLED: 1 VALVE_INFRA_VANGOGH_JOB_PRIORITY: "" # Empty tags are ignored by gitlab # post-merge pipeline - - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH - variables: - KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG} - JOB_PRIORITY: 40 - VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low + - if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push" # any other pipeline - if: $GITLAB_USER_LOGIN != "marge-bot" && $FORCE_KERNEL_TAG != null variables: @@ -168,19 +164,13 @@ include: # YAML anchors for rule conditions # -------------------------------- .rules-anchors: - # Post-merge pipeline - - &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH' - # Post-merge pipeline after Marge has merged an MR - - &is-post-merge-for-marge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH && $GITLAB_USER_LOGIN != "marge-bot"' - # Post-merge pipeline, not for Marge Bot - - &is-post-merge-not-for-marge '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_COMMIT_BRANCH' # Pre-merge pipeline - &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"' .never-post-merge-rules: rules: - - if: *is-post-merge-for-marge + - if: *is-post-merge when: never @@ -188,9 +178,11 @@ include: rules: # Run when re-enabling a disabled farm, but not when disabling it - !reference [.disable-farm-mr-rules, rules] - # Run pipeline by default in the main project if any CI pipeline - # configuration files were changed, to ensure docker images are up to date - - if: *is-post-merge + # Never run immediately after merging, as we just ran everything + - !reference [.never-post-merge-rules, rules] + # Run pipeline by default if it was triggered by Marge Bot, is for a + # merge request, and any files affecting the pipeline were changed + - if: *is-merge-attempt changes: &all_paths - VERSION - bin/git_sha1_gen.py @@ -211,24 +203,10 @@ include: - include/**/* - src/**/* when: on_success - # Run pipeline by default if it was triggered by Marge Bot, is for a - # merge request, and any files affecting the pipeline were changed - - if: *is-merge-attempt - changes: - *all_paths - when: on_success - # Run pipeline by default in the main project if it was not triggered by - # Marge Bot, and any files affecting the pipeline were changed - - if: *is-post-merge-not-for-marge - changes: - *all_paths - when: on_success # Just skip everything for MRs which don't actually change anything in the # build - the same rules as above, but without the file-change rules - if: *is-merge-attempt when: never - - if: *is-post-merge - when: never # Always allow user branches etc to trigger jobs manually - when: manual diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index be6562f944c..aa45e7031d1 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -200,6 +200,7 @@ # Rules for unusual architectures that only build a subset of drivers .ppc64el-rules: rules: + - !reference [.never-post-merge-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules] - !reference [.zink-common-rules, rules] - !reference [.softpipe-rules, rules] @@ -212,6 +213,7 @@ .s390x-rules: rules: + - !reference [.never-post-merge-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules] - !reference [.zink-common-rules, rules] - !reference [.softpipe-rules, rules] @@ -221,6 +223,7 @@ # Rules for linters .lint-rustfmt-rules: rules: + - !reference [.never-post-merge-rules, rules] - !reference [.core-rules, rules] - changes: - src/**/*.rs @@ -228,6 +231,7 @@ .lint-clang-format-rules: rules: + - !reference [.never-post-merge-rules, rules] - !reference [.core-rules, rules] - changes: - .clang-format diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 9fcf01cd462..f9ff8a97206 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -16,6 +16,8 @@ name: "mesa_${CI_JOB_NAME}" paths: - results/ + rules: + - !reference [.never-post-merge-rules, rules] .formatting-check: # Cancel job if a newer commit is pushed to the same branch diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index af102f43028..eb15e703246 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -1,6 +1,7 @@ .radeonsi-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.collabora-farm-rules, rules] - !reference [.gl-rules, rules] - changes: &amd_common_file_list @@ -27,6 +28,7 @@ .radv-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.vulkan-rules, rules] - changes: *amd_common_file_list @@ -40,12 +42,14 @@ .radv-collabora-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.collabora-farm-rules, rules] - !reference [.radv-rules, rules] .radv-valve-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.valve-farm-rules, rules] - !reference [.radv-rules, rules] @@ -53,6 +57,7 @@ stage: amd retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.valve-farm-manual-rules, rules] - !reference [.vulkan-manual-rules, rules] - changes: @@ -65,12 +70,14 @@ .radeonsi+radv-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.radeonsi-rules, rules] - !reference [.radv-rules, rules] .radeonsi-vaapi-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.radeonsi-rules, rules] - changes: &radeon_vcn_file_list - src/gallium/frontends/va/**/* @@ -80,6 +87,7 @@ .radeonsi-vaapi-manual-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: @@ -89,12 +97,14 @@ .radeonsi-valve-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.valve-farm-rules, rules] - !reference [.radeonsi-rules, rules] .radeonsi-valve-manual-rules: stage: amd rules: + - !reference [.test, rules] - !reference [.valve-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: diff --git a/src/broadcom/ci/gitlab-ci-inc.yml b/src/broadcom/ci/gitlab-ci-inc.yml index ceca272744b..0a427fea058 100644 --- a/src/broadcom/ci/gitlab-ci-inc.yml +++ b/src/broadcom/ci/gitlab-ci-inc.yml @@ -22,7 +22,7 @@ rules: - if: $FORCE_KERNEL_TAG != null when: never - - !reference [.never-post-merge-rules, rules] + - !reference [.test, rules] - !reference [.igalia-farm-rules, rules] - !reference [.gl-rules, rules] - !reference [.broadcom-common-rules, rules] @@ -36,6 +36,7 @@ .vc4-manual-rules: stage: broadcom rules: + - !reference [.test, rules] - !reference [.igalia-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - !reference [.broadcom-common-manual-rules, rules] @@ -47,7 +48,7 @@ rules: - if: $FORCE_KERNEL_TAG != null when: never - - !reference [.never-post-merge-rules, rules] + - !reference [.test, rules] - !reference [.igalia-farm-rules, rules] - !reference [.gl-rules, rules] - !reference [.broadcom-common-rules, rules] @@ -62,6 +63,7 @@ stage: broadcom retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.igalia-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - !reference [.broadcom-common-manual-rules, rules] @@ -74,7 +76,7 @@ rules: - if: $FORCE_KERNEL_TAG != null when: never - - !reference [.never-post-merge-rules, rules] + - !reference [.test, rules] - !reference [.igalia-farm-rules, rules] - !reference [.vulkan-rules, rules] - changes: &v3dv_file_list @@ -84,6 +86,7 @@ .v3dv-manual-rules: stage: broadcom rules: + - !reference [.test, rules] - !reference [.igalia-farm-manual-rules, rules] - !reference [.vulkan-manual-rules, rules] - changes: *v3dv_file_list diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml index bbff6ba85e7..6b936390568 100644 --- a/src/etnaviv/ci/gitlab-ci.yml +++ b/src/etnaviv/ci/gitlab-ci.yml @@ -1,6 +1,7 @@ .etnaviv-rules: stage: etnaviv rules: + - !reference [.test, rules] - !reference [.austriancoder-farm-rules, rules] - !reference [.gl-rules, rules] - changes: &etnaviv_file_list @@ -15,6 +16,7 @@ stage: etnaviv retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.austriancoder-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index 40867456b2b..a1441cbb002 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -1,6 +1,7 @@ # Rules for changes that impact either freedreno or turnip. .freedreno-common-rules: rules: + - !reference [.test, rules] - !reference [.no_scheduled_pipelines-rules, rules] - changes: &freedreno_core_file_list - src/freedreno/ci/**/* @@ -15,6 +16,7 @@ .freedreno-common-manual-rules: retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.core-manual-rules, rules] - changes: *freedreno_core_file_list @@ -25,6 +27,7 @@ .google-freedreno-rules: stage: freedreno rules: + - !reference [.test, rules] - !reference [.freedreno-farm-rules, rules] - !reference [.freedreno-common-rules, rules] - !reference [.gl-rules, rules] @@ -37,6 +40,7 @@ .collabora-freedreno-rules: stage: freedreno rules: + - !reference [.test, rules] - !reference [.collabora-farm-rules, rules] - !reference [.freedreno-common-rules, rules] - !reference [.gl-rules, rules] @@ -48,6 +52,7 @@ stage: freedreno retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.freedreno-farm-manual-rules, rules] - !reference [.freedreno-common-manual-rules, rules] - !reference [.gl-manual-rules, rules] @@ -59,6 +64,7 @@ stage: freedreno retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.freedreno-common-manual-rules, rules] - !reference [.gl-manual-rules, rules] @@ -70,6 +76,7 @@ .google-turnip-rules: stage: freedreno rules: + - !reference [.test, rules] - !reference [.freedreno-farm-rules, rules] - !reference [.freedreno-common-rules, rules] - !reference [.vulkan-rules, rules] @@ -80,6 +87,7 @@ .collabora-turnip-rules: stage: freedreno rules: + - !reference [.test, rules] - !reference [.collabora-farm-rules, rules] - !reference [.freedreno-common-rules, rules] - !reference [.vulkan-rules, rules] @@ -90,6 +98,7 @@ stage: freedreno retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.freedreno-farm-manual-rules, rules] - !reference [.freedreno-common-manual-rules, rules] - !reference [.vulkan-manual-rules, rules] @@ -101,6 +110,7 @@ stage: freedreno retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.freedreno-common-manual-rules, rules] - !reference [.vulkan-manual-rules, rules] @@ -111,23 +121,27 @@ # For piglit and skqp test jobs that run both GL and VK tests. .google-freedreno-turnip-rules: rules: + - !reference [.test, rules] - !reference [.google-freedreno-rules, rules] - !reference [.google-turnip-rules, rules] .collabora-freedreno-turnip-rules: rules: + - !reference [.test, rules] - !reference [.collabora-freedreno-rules, rules] - !reference [.collabora-turnip-rules, rules] .google-freedreno-rules-restricted: stage: freedreno rules: + - !reference [.test, rules] - !reference [.restricted-rules, rules] - !reference [.google-freedreno-rules, rules] .collabora-freedreno-rules-restricted: stage: freedreno rules: + - !reference [.test, rules] - !reference [.restricted-rules, rules] - !reference [.collabora-freedreno-rules, rules] @@ -135,6 +149,7 @@ stage: freedreno retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.performance-rules, rules] - !reference [.google-freedreno-manual-rules, rules] allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. @@ -150,6 +165,7 @@ stage: freedreno retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.performance-rules, rules] - !reference [.collabora-freedreno-manual-rules, rules] allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. diff --git a/src/gallium/drivers/lima/ci/gitlab-ci.yml b/src/gallium/drivers/lima/ci/gitlab-ci.yml index d20b3bf4bac..b9adf963717 100644 --- a/src/gallium/drivers/lima/ci/gitlab-ci.yml +++ b/src/gallium/drivers/lima/ci/gitlab-ci.yml @@ -1,6 +1,7 @@ .lima-rules: stage: arm rules: + - !reference [.test, rules] - !reference [.lima-farm-rules, rules] - !reference [.gl-rules, rules] - changes: diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml index e75c9c0c242..c14ab931f83 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml @@ -1,6 +1,7 @@ .llvmpipe-rules: stage: software-renderer rules: + - !reference [.test, rules] - if: $FORCE_KERNEL_TAG != null when: never - !reference [.gl-rules, rules] @@ -12,6 +13,7 @@ .llvmpipe-manual-rules: stage: software-renderer rules: + - !reference [.test, rules] - !reference [.gl-manual-rules, rules] - changes: *llvmpipe_file_list when: manual @@ -19,6 +21,7 @@ .llvmpipe-cl-rules: stage: software-renderer rules: + - !reference [.test, rules] - !reference [.no_scheduled_pipelines-rules, rules] - changes: &llvmpipe_cl_files - .gitlab-ci.yml @@ -36,6 +39,7 @@ .llvmpipe-rusticl-rules: rules: + - !reference [.test, rules] - !reference [.llvmpipe-cl-rules, rules] - changes: - src/gallium/frontends/rusticl/**/* diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml index df78e125a63..a2fb4821bc4 100644 --- a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml @@ -1,6 +1,7 @@ .nouveau-rules: stage: nouveau rules: + - !reference [.test, rules] - !reference [.anholt-farm-rules, rules] - !reference [.gl-rules, rules] - changes: &nouveau_file_list @@ -14,6 +15,7 @@ stage: nouveau retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.anholt-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml index 45590919819..7bc1d7d5c7d 100644 --- a/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml @@ -1,6 +1,7 @@ .softpipe-rules: stage: software-renderer rules: + - !reference [.test, rules] - if: $FORCE_KERNEL_TAG != null when: never - !reference [.gl-rules, rules] diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml index 496c2abd83a..4b92da40f73 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml @@ -1,6 +1,7 @@ .virgl-rules: stage: layered-backends rules: + - !reference [.test, rules] - if: $FORCE_KERNEL_TAG != null when: never - !reference [.gl-rules, rules] @@ -14,6 +15,7 @@ stage: layered-backends retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: @@ -25,6 +27,7 @@ stage: layered-backends retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.performance-rules, rules] - !reference [.gl-manual-rules, rules] diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 8c06c5c5d90..edcaa6483b5 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -1,5 +1,6 @@ .zink-common-rules: rules: + - !reference [.test, rules] - !reference [.gl-rules, rules] - changes: - src/gallium/drivers/zink/**/* @@ -8,6 +9,7 @@ .zink-common-manual-rules: retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.gl-manual-rules, rules] - changes: - src/gallium/drivers/zink/**/* @@ -16,12 +18,14 @@ .zink-lvp-rules: stage: layered-backends rules: + - !reference [.test, rules] - !reference [.lavapipe-rules, rules] - !reference [.zink-common-rules, rules] .zink-anv-rules: stage: layered-backends rules: + - !reference [.test, rules] - !reference [.anv-rules, rules] - !reference [.zink-common-rules, rules] @@ -29,12 +33,14 @@ stage: layered-backends retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.anv-manual-rules, rules] - !reference [.zink-common-manual-rules, rules] .zink-anv-rules-restricted: stage: layered-backends rules: + - !reference [.test, rules] - !reference [.restricted-rules, rules] - !reference [.anv-rules, rules] - !reference [.zink-common-rules, rules] @@ -42,6 +48,7 @@ .zink-turnip-rules: stage: layered-backends rules: + - !reference [.test, rules] - !reference [.collabora-turnip-rules, rules] - !reference [.zink-common-rules, rules] variables: @@ -51,12 +58,14 @@ stage: layered-backends retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-turnip-manual-rules, rules] - !reference [.zink-common-manual-rules, rules] .zink-radv-rules: stage: layered-backends rules: + - !reference [.test, rules] - !reference [.radv-valve-rules, rules] - !reference [.zink-common-rules, rules] @@ -64,6 +73,7 @@ stage: layered-backends retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.radv-valve-manual-rules, rules] - !reference [.zink-common-manual-rules, rules] - changes: @@ -122,4 +132,4 @@ B2C_TIMEOUT_OVERALL_MINUTES: 20 # Disable reporting, since DUTs don't have internet access - FLAKES_CHANNEL: "" \ No newline at end of file + FLAKES_CHANNEL: "" diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml index 045db174ac9..7f491c26148 100644 --- a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml +++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml @@ -1,6 +1,7 @@ .lavapipe-rules: stage: software-renderer rules: + - !reference [.test, rules] - if: $FORCE_KERNEL_TAG != null when: never - !reference [.vulkan-rules, rules] @@ -15,6 +16,7 @@ stage: software-renderer retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.vulkan-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: *lavapipe_file_list diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index 3316daadaed..3375bc0ee23 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -1,6 +1,7 @@ .i915g-rules: stage: intel rules: + - !reference [.test, rules] - !reference [.gl-rules, rules] - changes: &i915g_file_list - src/gallium/drivers/i915/**/* @@ -12,6 +13,7 @@ stage: intel retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.gl-manual-rules, rules] - changes: *i915g_file_list @@ -20,6 +22,7 @@ .crocus-rules: stage: intel rules: + - !reference [.test, rules] - !reference [.anholt-farm-rules, rules] - !reference [.gl-rules, rules] - changes: &crocus_file_list @@ -32,6 +35,7 @@ stage: intel retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.anholt-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: @@ -41,6 +45,7 @@ .iris-rules: stage: intel rules: + - !reference [.test, rules] - !reference [.no_scheduled_pipelines-rules, rules] - !reference [.collabora-farm-rules, rules] - !reference [.gl-rules, rules] @@ -54,6 +59,7 @@ stage: intel retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: @@ -67,6 +73,7 @@ stage: intel retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.performance-rules, rules] - !reference [.gl-manual-rules, rules] @@ -84,6 +91,7 @@ .anv-rules: stage: intel rules: + - !reference [.test, rules] - !reference [.no_scheduled_pipelines-rules, rules] - !reference [.collabora-farm-rules, rules] - !reference [.vulkan-rules, rules] @@ -95,6 +103,7 @@ stage: intel retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.vulkan-manual-rules, rules] - changes: @@ -104,6 +113,7 @@ .hasvk-rules: stage: intel rules: + - !reference [.test, rules] - !reference [.anholt-farm-rules, rules] - !reference [.vulkan-rules, rules] - changes: @@ -114,6 +124,7 @@ stage: intel retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.anholt-farm-manual-rules, rules] - !reference [.vulkan-manual-rules, rules] - changes: @@ -124,12 +135,14 @@ .intel-rules: stage: intel rules: + - !reference [.test, rules] - !reference [.iris-rules, rules] - !reference [.anv-rules, rules] .intel-manual-rules: stage: intel rules: + - !reference [.test, rules] - !reference [.iris-manual-rules, rules] - !reference [.anv-manual-rules, rules] diff --git a/src/microsoft/ci/gitlab-ci-inc.yml b/src/microsoft/ci/gitlab-ci-inc.yml index c60ecd2de29..b2c66ec4737 100644 --- a/src/microsoft/ci/gitlab-ci-inc.yml +++ b/src/microsoft/ci/gitlab-ci-inc.yml @@ -17,7 +17,7 @@ # rules duplication manually .windows-build-rules: rules: - - !reference [.never-post-merge-rules, rules] + - !reference [.test, rules] - !reference [.microsoft-farm-rules, rules] - !reference [.zink-common-rules, rules] - !reference [.vulkan-rules, rules] @@ -39,6 +39,7 @@ .glon12-test-rules: rules: + - !reference [.test, rules] - !reference [.microsoft-farm-rules, rules] - !reference [.gl-rules, rules] - changes: *d3d12_file_list @@ -49,6 +50,7 @@ .spirv2dxil-test-rules: rules: + - !reference [.test, rules] - !reference [.microsoft-farm-rules, rules] - !reference [.core-rules, rules] - changes: &spirv2dxil_file_list @@ -59,6 +61,7 @@ .dozen-test-rules: rules: + - !reference [.test, rules] - !reference [.microsoft-farm-rules, rules] - !reference [.vulkan-rules, rules] - changes: diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index dc8730d2f06..6f089798e66 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -1,6 +1,7 @@ .panfrost-midgard-rules: stage: arm rules: + - !reference [.test, rules] - !reference [.collabora-farm-rules, rules] - !reference [.gl-rules, rules] - changes: &panfrost_gallium_file_list @@ -22,6 +23,7 @@ stage: arm retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.gl-manual-rules, rules] - changes: *panfrost_gallium_file_list @@ -35,6 +37,7 @@ .panfrost-bifrost-rules: stage: arm rules: + - !reference [.test, rules] - !reference [.collabora-farm-rules, rules] - !reference [.vulkan-rules, rules] - !reference [.gl-rules, rules] @@ -55,6 +58,7 @@ stage: arm retry: !reference [.scheduled_pipeline-rules, retry] rules: + - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] - !reference [.vulkan-manual-rules, rules] - !reference [.gl-manual-rules, rules] diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml index 6c31ca2716f..267511ef2d0 100644 --- a/src/virtio/ci/gitlab-ci.yml +++ b/src/virtio/ci/gitlab-ci.yml @@ -1,6 +1,7 @@ .venus-rules: stage: layered-backends rules: + - !reference [.test, rules] - !reference [.lavapipe-rules, rules] - changes: &venus_file_list - src/virtio/**/*
