mirror of https://github.com/containers/podman.git
cirrus.yml: automatic skips based on source
As we want to get rid of the special titles convert the existing skips to the only_if condition, this makes it more readable as we do not need to negate so much. Then add similar conditions for all test tasks, this removes the need to a special title such as CI:DOCS as the logic is smart enough to only docs changes when no source code was changed. Update the documentation for the new logic and no longer point contributors to the CI:DOCS title as it is gone now. There is a bunch of duplication in the rules as yaml doesn't allow us to share only parts of a string. To prevent unwanted drift a test case in contrib/cirrus/cirrus_yaml_test.py is added to ensure all conditions follow the same base ruleset. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
parent
189d862d54
commit
55ad0d6e0e
245
.cirrus.yml
245
.cirrus.yml
|
|
@ -222,7 +222,7 @@ build_aarch64_task:
|
|||
alt_build_task:
|
||||
name: "$ALT_NAME"
|
||||
alias: alt_build
|
||||
# Don't create task for [CI:DOCS], or rhel-release builds
|
||||
# Don't create task on rhel-release builds
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: &no_rhel_release |
|
||||
$CIRRUS_BRANCH !=~ 'v[0-9\.]+-rhel' &&
|
||||
|
|
@ -314,9 +314,7 @@ freebsd_alt_build_task:
|
|||
alias: freebsd_alt_build
|
||||
# Only run on 'main' and PRs against 'main'
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: |
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*' &&
|
||||
( $CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'main' )
|
||||
only_if: $CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'main'
|
||||
env:
|
||||
<<: *stdenvars
|
||||
# Functional FreeBSD builds must be built natively since they depend on CGO
|
||||
|
|
@ -368,13 +366,16 @@ build_success_task:
|
|||
bindings_task:
|
||||
name: "Test Bindings"
|
||||
alias: bindings
|
||||
# Don't create task for PRs using [CI:DOCS] or [CI:BUILD]
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - bindings test code is changed; or
|
||||
# - actual source code changed
|
||||
only_if: >-
|
||||
$CIRRUS_PR != '' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*'
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('pkg/bindings/test/**') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: &build
|
||||
- build_success
|
||||
gce_instance: *standardvm
|
||||
|
|
@ -410,11 +411,6 @@ bindings_task:
|
|||
swagger_task:
|
||||
name: "Test Swagger"
|
||||
alias: swagger
|
||||
# Don't create task for [CI:BUILD]
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: |
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*'
|
||||
depends_on: *build
|
||||
gce_instance: *standardvm
|
||||
env:
|
||||
|
|
@ -496,14 +492,16 @@ win_installer_task:
|
|||
docker-py_test_task:
|
||||
name: Docker-py Compat.
|
||||
alias: docker-py_test
|
||||
# Don't create task for tags, branches, or PRs w/ [CI:<magic>]
|
||||
# N/B: for PRs $CIRRUS_BRANCH == 'pull/<number>'
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: ¬_tag_branch_build_docs_machine >-
|
||||
$CIRRUS_PR != '' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*'
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - docker-py test code is changed; or
|
||||
# - actual source code changed
|
||||
only_if: >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('test/python/**') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: *build
|
||||
gce_instance: *standardvm
|
||||
env:
|
||||
|
|
@ -520,8 +518,17 @@ docker-py_test_task:
|
|||
unit_test_task:
|
||||
name: "Unit tests on $DISTRO_NV"
|
||||
alias: unit_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_branch_build_docs_machine
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - unit test files are changed (contains a false positves such as test/e2e/
|
||||
# but that should not be an issue, it only runs when it doesn't have to)
|
||||
# - actual source code changed
|
||||
only_if: >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('**/*_test.go') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: *build
|
||||
matrix:
|
||||
- env: *stdenvars
|
||||
|
|
@ -542,8 +549,16 @@ unit_test_task:
|
|||
apiv2_test_task:
|
||||
name: "APIv2 test on $DISTRO_NV ($PRIV_NAME)"
|
||||
alias: apiv2_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_branch_build_docs_machine
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - apiv2 test code is changed; or
|
||||
# - actual source code changed
|
||||
only_if: >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('test/apiv2/**') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: *build
|
||||
gce_instance: *standardvm
|
||||
# Test is normally pretty quick, about 10-minutes. If it hangs,
|
||||
|
|
@ -566,8 +581,16 @@ apiv2_test_task:
|
|||
compose_test_task:
|
||||
name: "$TEST_FLAVOR test on $DISTRO_NV ($PRIV_NAME)"
|
||||
alias: compose_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_branch_build_docs_machine
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - compose test code is changed; or
|
||||
# - actual source code changed
|
||||
only_if: >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('test/compose/**') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: *build
|
||||
gce_instance: *standardvm
|
||||
matrix:
|
||||
|
|
@ -590,19 +613,16 @@ local_integration_test_task: &local_integration_test_task
|
|||
# <int.|sys.> <podman|remote> <Distro NV> <root|rootless>
|
||||
name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON ${CI_DESIRED_DATABASE}"
|
||||
alias: local_integration_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_branch_build_docs_machine
|
||||
# skip when: - it is a PR (we never want to skip on nightly tests); and
|
||||
# - CI:ALL title is not set; and
|
||||
# - no danger files are changed; and
|
||||
# - when no int test code is changed; and
|
||||
# - NOT (source code is changed AND NOT only test files)
|
||||
skip: &skip_int_test >-
|
||||
$CIRRUS_PR != '' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:ALL.*' &&
|
||||
!changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') &&
|
||||
!changesInclude('test/e2e/**', 'test/utils/**') &&
|
||||
!(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - int test code is changed; or
|
||||
# - actual source code changed
|
||||
only_if: &only_if_int_test >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('test/e2e/**', 'test/utils/**') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: *build
|
||||
matrix: *platform_axis
|
||||
# integration tests scale well with cpu as they are parallelized
|
||||
|
|
@ -643,8 +663,7 @@ container_integration_test_task:
|
|||
name: *std_name_fmt
|
||||
alias: container_integration_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_branch_build_docs_machine
|
||||
skip: *skip_int_test
|
||||
only_if: *only_if_int_test
|
||||
depends_on: *build
|
||||
matrix: &fedora_vm_axis
|
||||
- env:
|
||||
|
|
@ -672,8 +691,7 @@ rootless_integration_test_task:
|
|||
name: *std_name_fmt
|
||||
alias: rootless_integration_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_branch_build_docs_machine
|
||||
skip: *skip_int_test
|
||||
only_if: *only_if_int_test
|
||||
depends_on: *build
|
||||
matrix: *platform_axis
|
||||
gce_instance: *fastvm
|
||||
|
|
@ -690,22 +708,14 @@ rootless_integration_test_task:
|
|||
podman_machine_task:
|
||||
name: *std_name_fmt
|
||||
alias: podman_machine
|
||||
# Only run for PRs and never [CI:DOCS] or [CI:BUILD]
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: &machine_cron_not_tag_build_docs >-
|
||||
($CIRRUS_PR != '' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*'
|
||||
) || $CIRRUS_CRON == "main"
|
||||
# skip when: - it is a PR (we never want to skip on nightly tests); and
|
||||
# - CI:ALL title is not set; and
|
||||
# - no danger files are changed; and
|
||||
# - no machine code files are changed
|
||||
skip: &skip_machine_test >-
|
||||
$CIRRUS_PR != '' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:ALL.*' &&
|
||||
!changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') &&
|
||||
!changesInclude('cmd/podman/machine/**', 'pkg/machine/**', '**/*machine*.go')
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - machine code files are changed
|
||||
only_if: &only_if_machine_test >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('cmd/podman/machine/**', 'pkg/machine/**', '**/*machine*.go')
|
||||
depends_on: *build
|
||||
ec2_instance:
|
||||
image: "${VM_IMAGE_NAME}"
|
||||
|
|
@ -726,8 +736,7 @@ podman_machine_task:
|
|||
podman_machine_aarch64_task:
|
||||
name: *std_name_fmt
|
||||
alias: podman_machine_aarch64
|
||||
only_if: *machine_cron_not_tag_build_docs
|
||||
skip: *skip_machine_test
|
||||
only_if: *only_if_machine_test
|
||||
depends_on: *build
|
||||
ec2_instance:
|
||||
<<: *standard_build_ec2_aarch64
|
||||
|
|
@ -750,10 +759,8 @@ podman_machine_aarch64_task:
|
|||
podman_machine_windows_task:
|
||||
name: *std_name_fmt
|
||||
alias: podman_machine_windows
|
||||
# Only run for non-docs/copr PRs and non-release branch builds
|
||||
# and never for tags. Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *machine_cron_not_tag_build_docs
|
||||
skip: *skip_machine_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *only_if_machine_test
|
||||
depends_on: *build
|
||||
ec2_instance:
|
||||
<<: *windows
|
||||
|
|
@ -777,8 +784,7 @@ podman_machine_windows_task:
|
|||
podman_machine_mac_task:
|
||||
name: *std_name_fmt
|
||||
alias: podman_machine_mac
|
||||
only_if: *machine_cron_not_tag_build_docs
|
||||
skip: *skip_machine_test
|
||||
only_if: *only_if_machine_test
|
||||
depends_on: *build
|
||||
persistent_worker: *mac_pw
|
||||
env:
|
||||
|
|
@ -824,24 +830,16 @@ podman_machine_mac_task:
|
|||
local_system_test_task: &local_system_test_task
|
||||
name: *std_name_fmt
|
||||
alias: local_system_test
|
||||
# Don't create task for tags, or if using [CI:*] magic
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: ¬_tag_magic >-
|
||||
$CIRRUS_TAG == '' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*'
|
||||
# skip when: - it is a PR (we never want to skip on nightly tests); and
|
||||
# - CI:ALL title is not set; and
|
||||
# - no danger files are changed; and
|
||||
# - no system test code is changed; and
|
||||
# - NOT (source code is changed AND not only test files)
|
||||
skip: &skip_system_test >-
|
||||
$CIRRUS_PR != '' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:ALL.*' &&
|
||||
!changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') &&
|
||||
!changesInclude('test/system/**') &&
|
||||
!(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - sys test code is changed; or
|
||||
# - actual source code changed
|
||||
only_if: &only_if_system_test >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('test/system/**') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: *build
|
||||
matrix: *platform_axis
|
||||
gce_instance: *standardvm
|
||||
|
|
@ -856,10 +854,8 @@ local_system_test_task: &local_system_test_task
|
|||
local_system_test_aarch64_task: &local_system_test_task_aarch64
|
||||
name: *std_name_fmt
|
||||
alias: local_system_test_aarch64
|
||||
# Don't create task for tags, or if using [CI:DOCS], [CI:BUILD]
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_magic
|
||||
skip: *skip_system_test
|
||||
only_if: *only_if_system_test
|
||||
depends_on: *build
|
||||
persistent_worker: *mac_pw
|
||||
ec2_instance: *standard_build_ec2_aarch64
|
||||
|
|
@ -910,8 +906,7 @@ rootless_system_test_task:
|
|||
name: *std_name_fmt
|
||||
alias: rootless_system_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_magic
|
||||
skip: *skip_system_test
|
||||
only_if: *only_if_system_test
|
||||
depends_on: *build
|
||||
matrix: *platform_axis
|
||||
gce_instance: *standardvm
|
||||
|
|
@ -927,8 +922,16 @@ rootless_system_test_task:
|
|||
minikube_test_task:
|
||||
name: *std_name_fmt
|
||||
alias: minikube_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_magic
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - minikube test code is changed or one of the shared helper import files from the system test; or
|
||||
# - actual source code changed
|
||||
only_if: >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('test/minikube/**', 'test/system/*.bash') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
# 2024-05-21: flaking almost constantly since March.
|
||||
skip: $CI == $CI
|
||||
depends_on: *build
|
||||
|
|
@ -945,8 +948,16 @@ minikube_test_task:
|
|||
farm_test_task:
|
||||
name: *std_name_fmt
|
||||
alias: farm_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_magic
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - farm test code is changed or one of the shared helper import files from the system test; or
|
||||
# - actual source code changed
|
||||
only_if: >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('test/farm/**', 'test/system/*.bash') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: *build
|
||||
gce_instance: *standardvm
|
||||
env:
|
||||
|
|
@ -961,17 +972,15 @@ farm_test_task:
|
|||
buildah_bud_test_task:
|
||||
name: *std_name_fmt
|
||||
alias: buildah_bud_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_magic
|
||||
# skip when: - it is a PR (we never want to skip on nightly tests); and
|
||||
# - CI:ALL title is not set; and
|
||||
# - no danger files are changed; and
|
||||
# - no build source files are changed and no bud tests
|
||||
skip: >-
|
||||
$CIRRUS_PR != '' &&
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:ALL.*' &&
|
||||
!changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') &&
|
||||
!changesInclude('**/*build*.go', 'test/buildah-bud/**')
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - podman build source code files or bud tests files are changed
|
||||
# (vendor updates, i.e. buildah, are already covered in the main rules)
|
||||
only_if: >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('**/*build*.go', 'test/buildah-bud/**')
|
||||
depends_on: *build
|
||||
env:
|
||||
<<: *stdenvars
|
||||
|
|
@ -991,8 +1000,16 @@ buildah_bud_test_task:
|
|||
upgrade_test_task:
|
||||
name: "Upgrade test: from $PODMAN_UPGRADE_FROM"
|
||||
alias: upgrade_test
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: *not_tag_magic
|
||||
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
|
||||
# only when: - main rules (see doc above); or
|
||||
# - upgrade test code is changed or one of the shared helper import files from the system test; or
|
||||
# - actual source code changed
|
||||
only_if: >-
|
||||
$CIRRUS_PR == '' ||
|
||||
$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
|
||||
changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') ||
|
||||
changesInclude('test/upgrade/**', 'test/system/*.bash') ||
|
||||
(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
|
||||
depends_on: *build
|
||||
matrix:
|
||||
- env:
|
||||
|
|
@ -1092,12 +1109,7 @@ success_task:
|
|||
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
|
||||
container: *smallcontainer
|
||||
clone_script: *noop
|
||||
script: |
|
||||
if [[ "$CIRRUS_CHANGE_TITLE" =~ CI:MACHINE ]] && [[ -n "$CIRRUS_PR" ]]; then
|
||||
echo "Error: Risk of untested change merge."
|
||||
echo "Please remove [CI:MACHINE] from title."
|
||||
exit 1
|
||||
fi
|
||||
script: *noop
|
||||
|
||||
# WARNING: Most of the artifacts captured here are also have their
|
||||
# permalinks present in the `DOWNLOADS.md` file. Any changes made
|
||||
|
|
@ -1107,7 +1119,6 @@ artifacts_task:
|
|||
alias: artifacts
|
||||
# Docs: ./contrib/cirrus/CIModes.md
|
||||
only_if: >-
|
||||
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
|
||||
$CIRRUS_BRANCH !=~ 'v[0-9\.]+-rhel' &&
|
||||
$CIRRUS_BASE_BRANCH !=~ 'v[0-9\.]+-rhel'
|
||||
depends_on:
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ Thanks for sending a pull request!
|
|||
|
||||
Please make sure you've read our contributing guidelines and how to submit a pull request (https://github.com/containers/podman/blob/main/CONTRIBUTING.md#submitting-pull-requests).
|
||||
|
||||
In case you're only changing docs, make sure to prefix the pull-request title with "[CI:DOCS]". That will prevent functional tests from running and save time and energy.
|
||||
|
||||
Finally, be sure to sign commits with your real name. Since by opening
|
||||
a PR you already have commits, you can add signatures if needed with
|
||||
something like `git commit -s --amend`.
|
||||
|
|
|
|||
|
|
@ -162,10 +162,6 @@ when the PR is merged.
|
|||
|
||||
PRs will be approved by an [approver][owners] listed in [`OWNERS`](OWNERS).
|
||||
|
||||
In case you're only changing docs, make sure to prefix the PR title with
|
||||
"[CI:DOCS]". That will prevent functional tests from running and save time and
|
||||
energy.
|
||||
|
||||
### Describe your Changes in Commit Messages
|
||||
|
||||
Describe your problem. Whether your patch is a one-line bug fix or 5000 lines
|
||||
|
|
|
|||
|
|
@ -42,72 +42,32 @@ of this document, it's not possible to override the behavior of `$CIRRUS_PR`.
|
|||
|
||||
## Cirrus Task contexts and runtime modes
|
||||
|
||||
### Intended general PR Tasks (*italic*: matrix)
|
||||
+ *build*
|
||||
+ validate
|
||||
+ bindings
|
||||
+ swagger
|
||||
+ *alt_build*
|
||||
+ osx_alt_build
|
||||
+ freebsd_alt_build
|
||||
+ docker-py_test
|
||||
+ *unit_test*
|
||||
+ apiv2_test
|
||||
+ *compose_test*
|
||||
+ *local_integration_test*
|
||||
+ *remote_integration_test*
|
||||
+ *container_integration_test*
|
||||
+ *rootless_integration_test*
|
||||
+ *local_system_test*
|
||||
+ *remote_system_test*
|
||||
+ *rootless_remote_system_test*
|
||||
+ *buildah_bud_test*
|
||||
+ *rootless_system_test*
|
||||
+ rootless_gitlab_test
|
||||
+ *upgrade_test*
|
||||
+ meta
|
||||
+ success
|
||||
+ artifacts
|
||||
By default cirrus will trigger task depending on the source changes.
|
||||
|
||||
### Intended for PR w/ "release" or "bump" in title:
|
||||
+ (All the general PR tasks above)
|
||||
+ release_test
|
||||
It is implemented using the `only_if` field for the cirrus tasks, this logic
|
||||
uses the following main rules:
|
||||
- Never skip on cron runs: `$CIRRUS_PR == ''`
|
||||
- Never skip when using the special `CI:ALL` title: `$CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*'`, see below.
|
||||
- Never skip when a danger file is changed, these files contain things that can
|
||||
affect any tasks so the code cannot skip it. It includes
|
||||
- `.cirrus.yml` (cirrus changes)
|
||||
- `Makefile` (make targets are used to trigger tests)
|
||||
- `contrib/cirrus/**` (cirrus scripts to run the tests)
|
||||
- `vendor/**` (dependency updates)
|
||||
- `hack/**` (contains scripts used by several tests)
|
||||
- `version/rawversion/*` (podman version changes, intended to ensure all release PRs test everything to not release known broken code)
|
||||
|
||||
### Intended `[CI:DOCS]` PR Tasks:
|
||||
+ *build*
|
||||
+ validate
|
||||
+ swagger
|
||||
+ meta
|
||||
+ success
|
||||
After that, task-specific rules are added, check [.cirrus.yml](../../.cirrus.yml) for them.
|
||||
Another common rule used there is `(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))`.
|
||||
This rule defines the set of source code. Podman uses both go and c source code,
|
||||
however as some tests are also using go code we manually exclude the test
|
||||
directories from this list.
|
||||
|
||||
### Intended `[CI:BUILD]` PR Tasks:
|
||||
+ *build*
|
||||
+ validate
|
||||
+ *alt_build*
|
||||
+ osx_alt_build
|
||||
+ freebsd_alt_build
|
||||
+ meta
|
||||
+ success
|
||||
+ artifacts
|
||||
### Intended `[CI:ALL]` behavior:
|
||||
|
||||
### Intended `[CI:MACHINE]` PR Tasks:
|
||||
|
||||
If and only if the PR is in **draft-mode**, run only the following
|
||||
tasks. The draft-mode check is necessary to remove the risk of
|
||||
merging a change that affects the untested aspects of podman.
|
||||
|
||||
+ *build*
|
||||
+ validate
|
||||
+ *alt_build*
|
||||
+ win_installer
|
||||
+ osx_alt_build
|
||||
+ podman_machine_task
|
||||
+ podman_machine_aarch64_task
|
||||
+ podman_machine_windows_task
|
||||
+ podman_machine_mac_task
|
||||
+ meta
|
||||
+ success
|
||||
+ artifacts
|
||||
As of June 2024, the default Cirrus CI setup skips tasks that it deems
|
||||
unnecessary, such as running e2e or system tests on a doc-only PR (see
|
||||
#23174). This string in a PR title forces all CI jobs to run.
|
||||
|
||||
### Intended `[CI:NEXT]` behavior:
|
||||
|
||||
|
|
@ -125,32 +85,3 @@ is removed.
|
|||
**Note:** When changing the draft-status of PR, you will need to re-push a
|
||||
commit-change before Cirrus-CI will notice the draft-status update (i.e.
|
||||
pressing the re-run button **is not** good enough).
|
||||
|
||||
### Intended `[CI:ALL]` behavior:
|
||||
|
||||
Run even the tasks that are skipped based on changed sources conditions otherwise.
|
||||
|
||||
### Intended Branch tasks (and Cirrus-cron jobs):
|
||||
+ *build*
|
||||
+ swagger
|
||||
+ *alt_build*
|
||||
+ osx_alt_build
|
||||
+ freebsd_alt_build
|
||||
+ *local_system_test*
|
||||
+ *remote_system_test*
|
||||
+ *rootless_remote_system_test*
|
||||
+ *rootless_system_test*
|
||||
+ meta
|
||||
+ success
|
||||
+ artifacts
|
||||
|
||||
### Intended for new Tag tasks:
|
||||
+ *build*
|
||||
+ swagger
|
||||
+ *alt_build*
|
||||
+ osx_alt_build
|
||||
+ freebsd_alt_build
|
||||
+ meta
|
||||
+ success
|
||||
+ artifacts
|
||||
+ release
|
||||
|
|
|
|||
|
|
@ -60,20 +60,20 @@ class TestDependsOn(TestCaseBase):
|
|||
msg=('No success aggregation task depends_on "{0}"'.format(task_name))
|
||||
self.assertIn(task_name, success_deps, msg=msg)
|
||||
|
||||
def test_skips(self):
|
||||
"""2024-06 PR#23030: ugly but necessary duplication in skip conditions. Prevent typos or unwanted changes."""
|
||||
beginning = "$CIRRUS_PR != '' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:ALL.*' && !changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') && "
|
||||
real_source_changes = " && !(changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))"
|
||||
def test_only_if(self):
|
||||
"""2024-07 PR#23174: ugly but necessary duplication in only_if conditions. Prevent typos or unwanted changes."""
|
||||
beginning = "$CIRRUS_PR == '' || $CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' || changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'hack/**', 'version/rawversion/*') || "
|
||||
real_source_changes = " || (changesInclude('**/*.go', '**/*.c') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))"
|
||||
|
||||
for task_name in self.ALL_TASK_NAMES:
|
||||
task = self.CIRRUS_YAML[task_name + '_task']
|
||||
if 'skip' in task:
|
||||
skip = task['skip']
|
||||
if 'changesInclude' in skip:
|
||||
msg = ('{0}: invalid skip'.format(task_name))
|
||||
self.assertEqual(skip[:len(beginning)], beginning, msg=msg+": beginning part is wrong")
|
||||
if 'changesIncludeOnly' in skip:
|
||||
self.assertEqual(skip[len(skip)-len(real_source_changes):], real_source_changes, msg=msg+": changesIncludeOnly() part is wrong")
|
||||
if 'only_if' in task:
|
||||
only_if = task['only_if']
|
||||
if 'changesInclude' in only_if:
|
||||
msg = ('{0}: invalid only_if'.format(task_name))
|
||||
self.assertEqual(only_if[:len(beginning)], beginning, msg=msg+": beginning part is wrong")
|
||||
if 'changesIncludeOnly' in only_if:
|
||||
self.assertEqual(only_if[len(only_if)-len(real_source_changes):], real_source_changes, msg=msg+": changesIncludeOnly() part is wrong")
|
||||
|
||||
def not_task(self):
|
||||
"""Ensure no task is named 'task'"""
|
||||
|
|
|
|||
Loading…
Reference in New Issue