ci: Rename .ci-run-policy rules to .build-rules.

... and explain what they're doing, compared to the test rules in
test-source-dep.yml.

Unfortunately, we can't really pull them into test-source-dep.yml with
other source deps, because of various '&'-'*' references.

Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17386>
This commit is contained in:
Emma Anholt 2022-07-07 11:36:05 -07:00 committed by Marge Bot
parent 7c2fe7bf4b
commit 4ebb1c5ab3
6 changed files with 16 additions and 16 deletions

View File

@ -126,7 +126,7 @@ stages:
.docs-base:
extends:
- .fdo.ci-fairy
- .ci-run-policy
- .build-rules
script:
- apk --no-cache add graphviz doxygen
- pip3 install sphinx breathe mako sphinx_rtd_theme
@ -177,8 +177,8 @@ test-docs-mr:
when: on_success
# Other cases default to never
# When to automatically run the CI
.ci-run-policy:
# When to automatically run the CI for build jobs
.build-rules:
rules:
- !reference [.no_scheduled_pipelines-rules, rules]
# If any files affecting the pipeline are changed, build/test jobs run
@ -217,7 +217,7 @@ test-docs-mr:
.container-rules:
extends:
- .ci-run-policy
- .build-rules
rules:
- !reference [.no_scheduled_pipelines-rules, rules]
# Run pipeline by default in the main project if any CI pipeline

View File

@ -1,6 +1,6 @@
# Shared between windows and Linux
.build-common:
extends: .ci-run-policy
extends: .build-rules
# Cancel job if a newer commit is pushed to the same branch
interruptible: true
artifacts:

View File

@ -62,7 +62,7 @@
- .container
- .incorporate-base-tag+templates-commit
# Don't want the .container rules
- .ci-run-policy
- .build-rules
# Debian 11 based x86 build image base
debian/x86_build-base:
@ -277,7 +277,7 @@ fedora/x86_build:
.kernel+rootfs:
extends:
- .ci-run-policy
- .build-rules
stage: container
variables:
GIT_STRATEGY: fetch
@ -328,7 +328,7 @@ debian/arm_test:
- .fdo.container-build@debian
- .container
# Don't want the .container rules
- .ci-run-policy
- .build-rules
needs:
- kernel+rootfs_arm64
- kernel+rootfs_armhf
@ -406,7 +406,7 @@ windows_build_vs2019:
rules:
- if: '$MICROSOFT_FARM == "offline"'
when: never
- !reference [.ci-run-policy, rules]
- !reference [.build-rules, rules]
variables:
MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH}
MESA_IMAGE_TAG: &windows_build_image_tag ${WINDOWS_X64_BUILD_TAG}
@ -426,7 +426,7 @@ windows_test_vs2019:
rules:
- if: '$MICROSOFT_FARM == "offline"'
when: never
- !reference [.ci-run-policy, rules]
- !reference [.build-rules, rules]
variables:
MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH}
MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_BUILD_TAG}--${WINDOWS_X64_TEST_TAG}

View File

@ -1,6 +1,6 @@
.lava-test:
extends:
- .ci-run-policy
- .build-rules
# Cancel job if a newer commit is pushed to the same branch
interruptible: true
variables:

View File

@ -14,8 +14,8 @@
- if: *is-scheduled-pipeline
when: never
# Mesa core source file dependencies that may impact any build or test.
# ---------------------------------------------------------------------
# Mesa core source file dependencies that may impact any test job
# ---------------------------------------------------------------
.core-rules:
rules:
- !reference [.no_scheduled_pipelines-rules, rules]
@ -39,7 +39,7 @@
- src/util/**/*
when: on_success
# Mesa source file dependencies that may impact any GL driver build or test.
# Mesa source file dependencies that may impact any GL driver test job.
.gl-rules:
rules:
- !reference [.core-rules, rules]

View File

@ -1,6 +1,6 @@
.test:
extends:
- .ci-run-policy
- .build-rules
# Cancel job if a newer commit is pushed to the same branch
interruptible: true
variables:
@ -116,7 +116,7 @@
.baremetal-test:
extends:
- .ci-run-policy
- .build-rules
- .test
# Cancel job if a newer commit is pushed to the same branch
interruptible: true