summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-07-10 10:02:27 -0400
committerChris Evich <cevich@redhat.com>2019-07-10 10:32:48 -0400
commit7678a1ef905c8a2718f3d0a16d544ff24d57b428 (patch)
tree79c75bc7266053c8ee4fd8e8932fbf3ea3c613a3
parent61b20df9e66f3eb569d43a462dc4ec98aa01850a (diff)
downloadpodman-7678a1ef905c8a2718f3d0a16d544ff24d57b428.tar.gz
podman-7678a1ef905c8a2718f3d0a16d544ff24d57b428.tar.bz2
podman-7678a1ef905c8a2718f3d0a16d544ff24d57b428.zip
Cirrus: Fix #3543: Failure in 'release' task
Normally when testing PRs, the final task to run is 'success'. It's purpose is three-fold: - Notify on IRC that a PR passed all testing. - Block merging of a PR unless all dependent tasks are successful. - When successful, publish cached binary release archives. Mistakenly, the 'release' task was not made dependent upon the 'success' task. Since 'success' only runs for PRs, this was causing post-merge failures due to the 'release' task not finding any release archives - the tasks which generate them are still running. Fix this by making the 'release' task depend upon the same items as the 'success' task. This will ensure it only runs as the very last step, for both PRs and on branches (post-merge). Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r--.cirrus.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 68fd102d7..da28bb597 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -476,13 +476,13 @@ verify_test_built_images_task:
always:
<<: *standardlogs
-
-# Post message to IRC if everything passed
+# Post message to IRC if everything passed PR testing
success_task:
only_if: $CIRRUS_BRANCH != 'master'
- depends_on: # ignores any dependent task conditions
+ # ignores any dependent task conditions, include everything except 'release'
+ depends_on: &alltasks
- "gating"
- "vendor"
- "varlink_api"
@@ -515,8 +515,7 @@ release_task:
# allow_failures: $CI == "true"
# skip_notifications: $CI == "true"
- depends_on:
- - "success"
+ depends_on: *alltasks
gce_instance:
image_name: "${IMAGE_BUILDER_CACHE_IMAGE_NAME}"