summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-11 02:07:09 +0100
committerGitHub <noreply@github.com>2020-02-11 02:07:09 +0100
commit34c9aeaffa2a8a0e9ef282e8480d6199fdedd529 (patch)
tree6d8d2c7c6af0c6cc0b48aa8b4e940e30f0f9ddcc
parent6271837a1d4f7308bf5613f8cee118d522d33130 (diff)
parent9e55bcc3044b24210bf16d92d38928dc3405207d (diff)
downloadpodman-34c9aeaffa2a8a0e9ef282e8480d6199fdedd529.tar.gz
podman-34c9aeaffa2a8a0e9ef282e8480d6199fdedd529.tar.bz2
podman-34c9aeaffa2a8a0e9ef282e8480d6199fdedd529.zip
Merge pull request #5112 from cevich/only_prune_from_master
Cirrus: Never run prune on other branches
-rw-r--r--.cirrus.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 655fa3830..4e751514d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -316,8 +316,10 @@ meta_task:
# Remove old and disused images based on labels set by meta_task
image_prune_task:
- # Do not run this frequently
- only_if: $CIRRUS_BRANCH == $DEST_BRANCH
+ # This should ONLY ever run from the master branch, and never
+ # anywhere else so it's behavior is always consistent, even
+ # as new branches are created.
+ only_if: $CIRRUS_BRANCH == "master"
depends_on:
- "meta"