DEBUG pruning

Author: vrutkovs

.cci.jenkinsfile

@@ -24,15 +24,34 @@ coreos.pod([image: 'registry.fedoraproject.org/fedora:30', privileged: true, kvm
               cosa_cmd("init https://github.com/coreos/fedora-coreos-config")
               cosa_cmd("fetch")
               cosa_cmd("build")
-              cosa_cmd("kola run")
+              //cosa_cmd("kola run")
               // sanity check kola actually ran and dumped its output in tmp/
-              coreos.shwrap("test -d /srv/tmp/kola")
-              cosa_cmd("buildextend-metal")
-              cosa_cmd("buildextend-installer")
-              cosa_cmd("buildextend-openstack")
-              cosa_cmd("buildextend-vmware")
-              cosa_cmd("compress")
-              cosa_cmd("buildupload --dry-run s3 --acl=public-read my-nonexistent-bucket/my/prefix")
+              //coreos.shwrap("test -d /srv/tmp/kola")
+              // cosa_cmd("buildextend-metal")
+              // cosa_cmd("buildextend-installer")
+              // cosa_cmd("buildextend-openstack")
+              // cosa_cmd("buildextend-vmware")
+              // cosa_cmd("compress")
+              // cosa_cmd("buildupload --dry-run s3 --acl=public-read my-nonexistent-bucket/my/prefix")
+
+              // test pruning
+              coreos.shwrap("cat /srv/builds/builds.json")
+              cosa_cmd("build ostree --force-image")
+              cosa_cmd("build ostree --force-image")
+              cosa_cmd("build ostree --force-image")
+              coreos.shwrap("cat /srv/builds/builds.json")
+              cosa_cmd("build ostree --force-image --skip-prune")
+              coreos.shwrap("cat /srv/builds/builds.json")
+              cosa_cmd("build ostree --force-image")
+              cosa_cmd("build ostree --force-image")
+              coreos.shwrap("cat /srv/builds/builds.json")
+              cosa_cmd("prune --workdir /srv --dry-run")
+              coreos.shwrap("cat /srv/builds/builds.json")
+              cosa_cmd("prune --workdir /srv --dry-run --keep-last-n=1")
+              coreos.shwrap("cat /srv/builds/builds.json")
+              cosa_cmd("prune --workdir /srv --dry-run --keep-last-n=0")
+              cosa_cmd("prune --workdir /srv --dry-run --keep-last-days=5")
+              coreos.shwrap("cat /srv/builds/builds.json")
           }
       }
 }

src/cmd-build

@@ -406,8 +406,10 @@ mv -T "${tmp_builddir}" "${builddir}"
 ln -Tsf "${buildid}" builds/latest
 
 if [ "${SKIP_PRUNE}" == 1 ]; then
+  echo "Running bump_timestamp '${buildid}' '${workdir}'"
   bump_timestamp "${buildid}" "${workdir}"
 else
+  echo "Running cmd-prune '${workdir}' '${workdir}'"
   "${dn}"/cmd-prune --workdir "${workdir}"
 fi
 rm builds/.build-commit

src/cmd-prune

@@ -41,6 +41,10 @@ if args.keep_last_days != DEFAULT_KEEP_LAST_DAYS:
     keep_younger_than = (datetime.now(timezone.utc) -
                          timedelta(days=args.keep_last_days))
 
+print(f"prune: keep_younger_than: {keep_younger_than}")
+print(f"prune: keep_last_n: {args.keep_last_n}")
+print(f"prune: keep_last_days: {args.keep_last_days}")
+
 skip_pruning = (not keep_younger_than and args.keep_last_n == 0)
 print(f"prune: skip_pruning: {skip_pruning}")
 
@@ -64,6 +68,7 @@ if skip_pruning:
     new_builds = scanned_builds
 else:
     if keep_younger_than:
+        print(f"prune: using keep_younger_than")
         for build in scanned_builds:
             if build.id in tagged_builds:
                 print(f"Skipping tagged build {build.id}")
@@ -76,6 +81,7 @@ else:
                 new_builds.append(build)
     else:
         n = args.keep_last_n
+        print(f"prune: using keep_last_n")
         assert(n > 0)
         for build in scanned_builds:
             if n == 0:
@@ -85,6 +91,7 @@ else:
                 n = n - 1
 
 print(f"prune: new builds: {new_builds}")
+print(f"prune: builds to delete: {builds_to_delete}")
 
 if len(builds_to_delete) == 0 or args.dry_run:
     print(f"prune: not removing any builds")

src/cmdlib.sh

@@ -687,6 +687,7 @@ get_latest_qemu() {
 }
 
 bump_timestamp() {
+    set -x
     local buildid=$1; shift
     local dir=$1; shift
     (python3 -c "
@@ -697,4 +698,5 @@ builds = Builds('${workdir:-$(pwd)}')
 builds.insert_build('${buildid}')
 builds.bump_timestamp()
 print('Build timestamp was updated')")
+    set +x
 }