Merge commit '0152d905022e47ccf43ebac18804fb970cb0609c'

.ci/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'
-          }
         }
       }
     }