summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-21 21:45:51 +0100
committerGitHub <noreply@github.com>2020-01-21 21:45:51 +0100
commitf467bb20bd1c98b1706fa3c4448857800395c169 (patch)
treef8ab193625b8fbcd3aafac97de625afb08838400
parentfb2bd26f7331ee3a1ca9690d9c2960ccadebc68f (diff)
parentfb8209ad78085949e12a343e223c40f42cb875ee (diff)
downloadpodman-f467bb20bd1c98b1706fa3c4448857800395c169.tar.gz
podman-f467bb20bd1c98b1706fa3c4448857800395c169.tar.bz2
podman-f467bb20bd1c98b1706fa3c4448857800395c169.zip
Merge pull request #4923 from cevich/docs_no_snap
[CI:DOCS] Cirrus: No upload snap for docs job
-rw-r--r--.cirrus.yml20
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"