Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support a CI-colon-MACHINE mode #20946

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Support a CI-colon-MACHINE mode #20946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 43 additions & 30 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,8 @@ bindings_task:
only_if: >-
$CIRRUS_PR != '' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*'
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*'
depends_on:
- build
gce_instance: *standardvm
Expand Down Expand Up @@ -319,7 +320,9 @@ swagger_task:
alias: swagger
# Don't create task for [CI:BUILD]
# Docs: ./contrib/cirrus/CIModes.md
only_if: $CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*'
only_if: |
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*'
depends_on:
- build
gce_instance: *standardvm
Expand Down Expand Up @@ -490,7 +493,8 @@ freebsd_alt_build_task:
# Only run on 'main' and PRs against 'main'
# Docs: ./contrib/cirrus/CIModes.md
only_if: |
$CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'main'
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*' &&
( $CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'main' )
depends_on:
- build
env:
Expand Down Expand Up @@ -518,13 +522,14 @@ freebsd_alt_build_task:
docker-py_test_task:
name: Docker-py Compat.
alias: docker-py_test
# Don't create task for tags, branches, or PRs w/ [CI:DOCS] or [CI:BUILD]
# 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: &not_tag_branch_build_docs >-
only_if: &not_tag_branch_build_docs_machine >-
$CIRRUS_PR != '' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*'
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*'

depends_on:
- build
Expand All @@ -544,7 +549,7 @@ unit_test_task:
name: "Unit tests on $DISTRO_NV"
alias: unit_test
# Docs: ./contrib/cirrus/CIModes.md
only_if: *not_tag_branch_build_docs
only_if: *not_tag_branch_build_docs_machine
depends_on:
- build
- validate
Expand All @@ -568,7 +573,7 @@ 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
only_if: *not_tag_branch_build_docs_machine
depends_on:
- build
- validate
Expand All @@ -594,7 +599,7 @@ 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
only_if: *not_tag_branch_build_docs_machine
depends_on:
- build
- validate
Expand Down Expand Up @@ -627,7 +632,7 @@ local_integration_test_task: &local_integration_test_task
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
only_if: *not_tag_branch_build_docs_machine
depends_on: &build_unit
- build
- unit_test
Expand Down Expand Up @@ -666,7 +671,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
only_if: *not_tag_branch_build_docs_machine
depends_on: *build_unit
matrix: &fedora_vm_axis
- env:
Expand Down Expand Up @@ -698,7 +703,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
only_if: *not_tag_branch_build_docs_machine
depends_on: *build_unit
matrix: *platform_axis
gce_instance: *standardvm
Expand All @@ -715,14 +720,15 @@ rootless_integration_test_task:
podman_machine_task:
name: *std_name_fmt
alias: podman_machine
# Don't create task for tags, or if using [CI:DOCS], [CI:BUILD]
# Only run for PRs and never [CI:DOCS] or [CI:BUILD]
# Docs: ./contrib/cirrus/CIModes.md
only_if: &not_tag_build_docs >-
$CIRRUS_TAG == '' &&
only_if: &not_tag_branch_build_docs >-
$CIRRUS_PR != '' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*'
depends_on:
- build
- validate
- local_integration_test
- remote_integration_test
- container_integration_test
Expand All @@ -747,7 +753,7 @@ podman_machine_task:
podman_machine_aarch64_task:
name: *std_name_fmt
alias: podman_machine_aarch64
only_if: *not_tag_build_docs
only_if: *not_tag_branch_build_docs
depends_on:
- build_aarch64
- validate_aarch64
Expand Down Expand Up @@ -775,11 +781,7 @@ podman_machine_windows_task:
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: >-
$CIRRUS_TAG == '' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
$CIRRUS_BRANCH !=~ 'v[0-9\.]+-rhel' &&
$CIRRUS_BASE_BRANCH !=~ 'v[0-9\.]+-rhel'
only_if: *not_tag_branch_build_docs
depends_on:
- alt_build
- build
Expand All @@ -805,7 +807,7 @@ podman_machine_windows_task:
podman_machine_mac_task:
name: *std_name_fmt
alias: podman_machine_mac
only_if: *no_rhel_release
only_if: *not_tag_branch_build_docs
depends_on:
- osx_alt_build
- local_integration_test
Expand Down Expand Up @@ -853,7 +855,13 @@ podman_machine_mac_task:
local_system_test_task: &local_system_test_task
name: *std_name_fmt
alias: local_system_test
only_if: *not_tag_build_docs
# Don't create task for tags, or if using [CI:*] magic
# Docs: ./contrib/cirrus/CIModes.md
only_if: &not_tag_magic >-
$CIRRUS_TAG == '' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*'
depends_on: *build_unit
matrix: *platform_axis
gce_instance: *standardvm
Expand All @@ -870,7 +878,7 @@ local_system_test_aarch64_task: &local_system_test_task_aarch64
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_build_docs
only_if: *not_tag_magic
depends_on:
- build_aarch64
- validate_aarch64
Expand Down Expand Up @@ -925,7 +933,7 @@ rootless_system_test_task:
name: *std_name_fmt
alias: rootless_system_test
# Docs: ./contrib/cirrus/CIModes.md
only_if: *not_tag_build_docs
only_if: *not_tag_magic
depends_on: *build_unit
matrix: *platform_axis
gce_instance: *standardvm
Expand All @@ -941,7 +949,7 @@ minikube_test_task:
name: *std_name_fmt
alias: minikube_test
# Docs: ./contrib/cirrus/CIModes.md
only_if: *not_tag_build_docs
only_if: *not_tag_magic
depends_on:
- build
- rootless_system_test
Expand All @@ -959,7 +967,7 @@ farm_test_task:
name: *std_name_fmt
alias: farm_test
# Docs: ./contrib/cirrus/CIModes.md
only_if: *not_tag_build_docs
only_if: *not_tag_magic
depends_on:
- build
- rootless_system_test
Expand All @@ -977,7 +985,7 @@ buildah_bud_test_task:
name: *std_name_fmt
alias: buildah_bud_test
# Docs: ./contrib/cirrus/CIModes.md
only_if: *not_tag_branch_build_docs
only_if: *not_tag_magic
depends_on:
- build
- local_integration_test
Expand All @@ -1000,7 +1008,7 @@ upgrade_test_task:
name: "Upgrade test: from $PODMAN_UPGRADE_FROM"
alias: upgrade_test
# Docs: ./contrib/cirrus/CIModes.md
only_if: *not_tag_branch_build_docs
only_if: *not_tag_magic
depends_on:
- build
- local_system_test
Expand Down Expand Up @@ -1114,7 +1122,12 @@ success_task:
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
TEST_ENVIRON: container
clone_script: *noop
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
cevich marked this conversation as resolved.
Show resolved Hide resolved
Comment on lines +1125 to +1130
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is brilliant.


# WARNING: Most of the artifacts captured here are also have their
# permalinks present in the `DOWNLOADS.md` file. Any changes made
Expand Down
20 changes: 19 additions & 1 deletion contrib/cirrus/CIModes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,25 @@ of this document, it's not possible to override the behavior of `$CIRRUS_PR`.
+ *alt_build*
+ osx_alt_build
+ freebsd_alt_build
+ test_image_build
+ meta
+ success
+ artifacts

### 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
Expand Down