cmd-build-with-buildah: add --skip-prune

This is used by the pipeline for some reason. We could probably rip it
out of there, but the dev case I think has value, so just add it.

Author: jlebon

src/cmd-build-with-buildah

@@ -20,15 +20,17 @@ Usage: coreos-assembler build-with-buildah
   --autolock=VERSION  If no base lockfile used, create one from any arch build of `VERSION`.
                       Note this is automatically enabled when adding to an existing multi-arch
                       non-strict build.
+  --skip-prune        Skip prunning previous builds
 EOF
 }
 
 VERSION=
 VERSIONARY=
 DIRECT=
 AUTOLOCK_VERSION=
+SKIP_PRUNE=
 rc=0
-options=$(getopt --options h,d --longoptions help,version:,versionary,direct,autolock: -- "$@") || rc=$?
+options=$(getopt --options h,d --longoptions help,version:,versionary,direct,autolock:,skip-prune -- "$@") || rc=$?
 [ $rc -eq 0 ] || {
     print_help
     exit 1
@@ -54,6 +56,9 @@ while true; do
             shift;
             AUTOLOCK_VERSION=$1
             ;;
+        --skip-prune)
+            SKIP_PRUNE=1
+            ;;
         --)
             shift
             break
@@ -163,7 +168,7 @@ build_with_buildah() {
             env -C "${tempdir}/src" TMPDIR="$(realpath cache)" buildah "$@"
     fi
 
-    /usr/lib/coreos-assembler/cmd-import "${final_ref}"
+    /usr/lib/coreos-assembler/cmd-import "${final_ref}" ${SKIP_PRUNE:+--skip-prune}
 
     rm -rf "${tempdir}"
 }

src/cmd-import

@@ -58,13 +58,16 @@ def main():
         # move into official location
         finalize_build(builds, build_meta, tmp_oci_archive, tmp_oci_manifest, tmp_lockfile)
 
-    subprocess.check_call(['/usr/lib/coreos-assembler/cmd-prune'])
+    if not args.skip_prune:
+        subprocess.check_call(['/usr/lib/coreos-assembler/cmd-prune'])
 
 
 def parse_args():
     parser = argparse.ArgumentParser(prog='cosa import')
     parser.add_argument("srcimg", metavar='IMAGE',
                         help="image to import (containers-transports(5) format)")
+    parser.add_argument("--skip-prune", action='store_true',
+                        help="Skip prunning previous builds")
     return parser.parse_args()