From 0152d905022e47ccf43ebac18804fb970cb0609c Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 14 Aug 2023 10:27:13 +0000
Subject: [PATCH] Squashed '.ci/' changes from 8df60af..cdc32e0

cdc32e0 Improve cleanup flow

git-subtree-dir: .ci
git-subtree-split: cdc32e01eae67cd2635fa89cad114c6f6a11359f
---
 vars/buildPodman.groovy | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/vars/buildPodman.groovy b/vars/buildPodman.groovy
index 7319c88..85c7aa9 100644
--- a/vars/buildPodman.groovy
+++ b/vars/buildPodman.groovy
@@ -62,10 +62,12 @@ def call(Map config=[:]) {
         }
 
         // Push to container registry if not PR
+        // incl. basic registry retention removing any untagged images
         stage('Push') {
           when { not { changeRequest() } }
           steps {
             sh 'make push'
+            sh 'make rm-remote-untagged'
           }
         }
 
@@ -74,12 +76,6 @@ def call(Map config=[:]) {
           steps {
             sh 'make clean'
           }
-
-          // Basic registry retention removing untagged images if not PR only
-          when { not { changeRequest() } }
-          steps {
-            sh 'make rm-remote-untagged'
-          }
         }
       }
     }