diff options
| author | Chris Evich <cevich@redhat.com> | 2020-01-21 14:39:46 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-01-21 15:00:58 -0500 |
| commit | fb8209ad78085949e12a343e223c40f42cb875ee (patch) | |
| tree | f8ab193625b8fbcd3aafac97de625afb08838400 /.cirrus.yml | |
| parent | fb2bd26f7331ee3a1ca9690d9c2960ccadebc68f (diff) | |
| download | podman-fb8209ad78085949e12a343e223c40f42cb875ee.tar.gz podman-fb8209ad78085949e12a343e223c40f42cb875ee.tar.bz2 podman-fb8209ad78085949e12a343e223c40f42cb875ee.zip | |
Cirrus: No upload snap for docs job
Previously, the upload-snap job was running during post-merge
testing when the magic ci-docs string was present in the PR
description. This fixes that and makes all the `only_if`'s
more consistent.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index fb6dd4cdb..464455c87 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -514,6 +514,7 @@ special_testing_cgroupv2_task: always: <<: *standardlogs + special_testing_endpoint_task: depends_on: @@ -561,7 +562,8 @@ test_build_cache_images_task: only_if: >- $CIRRUS_BRANCH != $DEST_BRANCH && - $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' + $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' && + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' depends_on: - "gating" @@ -593,7 +595,8 @@ verify_test_built_images_task: only_if: >- $CIRRUS_BRANCH != $DEST_BRANCH && - $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' + $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' && + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' depends_on: @@ -637,11 +640,13 @@ verify_test_built_images_task: always: <<: *standardlogs - upload_snap_task: + only_if: >- + $CIRRUS_BRANCH != $DEST_BRANCH && + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' # Only when PR or branch is merged into master - only_if: $CIRRUS_BRANCH == $DEST_BRANCH depends_on: - "test_building_snap" @@ -662,8 +667,11 @@ upload_snap_task: docs_task: - # Only run this for PRs on mention, but always run after merge - only_if: $CIRRUS_CHANGE_MESSAGE =~ '.*CI:DOCS.*' || $CIRRUS_BRANCH == $DEST_BRANCH + # Only run this for PRs on mention, and after merge + only_if: >- + $CIRRUS_BRANCH != $DEST_BRANCH && + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && + $CIRRUS_CHANGE_MESSAGE =~ '.*CI:DOCS.*' depends_on: - "gating" |