@@ -113,10 +113,15 @@
   -run-wait               : wait on run specified by target and runname
   -preclean               : remove the existing test directory before running the test
   -clean-cache            : remove the cached megatest.config and runconfigs.config files
   -no-cache               : do not use the cached config files. 
   -one-pass               : launch as many tests as you can but do not wait for more to be ready
+  -remove-keep N action   : remove all but N most recent runs per target
+                            * Use -actions print,remove-runs,archive to specify action to take
+                            * Add param -age 120d,3h,20m to apply only to runs older than the 
+                                 specified age
+                            * Add -precmd to insert a wrapper command in front of the commands run
 
 Selectors (e.g. use for -runtests, -remove-runs, -set-state-status, -list-runs etc.)
   -target key1/key2/...   : run for key1, key2, etc.
   -reqtarg key1/key2/...  : run for key1, key2, etc. but key1/key2 must be in runconfigs
   -testpatt patt1/patt2,patt3/...  : % is wildcard
@@ -290,11 +295,19 @@
 			"-env2file"
 			"-envcap"
 			"-envdelta"
 			"-setvars"
 			"-set-state-status"
+
+                        ;; move runs stuff here
+                        "-remove-keep"           
 			"-set-run-status"
+			"-age"
+			"-archive"
+			"-actions"
+			"-precmd"
+			
 			"-debug" ;; for *verbosity* > 2
 			"-create-test"
 			"-override-timeout"
 			"-test-files"  ;; -test-paths is for listing all
 			"-load"        ;; load and exectute a scheme file
@@ -304,11 +317,10 @@
 			"-run-id"
 			"-ping"
 			"-refdb2dat"
 			"-o"
 			"-log"
-			"-archive"
 			"-since"
 			"-fields"
 			"-recover-test" ;; run-id,test-id - used internally to recover a test stuck in RUNNING state
 			"-sort"
 			"-target-db"
@@ -1032,10 +1044,24 @@
      "remove runs"
      (lambda (target runname keys keyvals)
        (operate-on 'remove-runs mode: (if (args:get-arg "-keep-records")
                                           'remove-data-only
                                           'remove-all)))))
+
+(if (args:get-arg "-remove-keep")
+    (general-run-call 
+     "-remove-keep"
+     "remove keep"
+     (lambda (target runname keys keyvals)
+       (let ((actions (map string->symbol
+                           (string-split
+			    (or (args:get-arg "-actions")
+				"print")
+			    ",")))) ;; default to printing the output
+         (runs:remove-all-but-last-n-runs-per-target target runname
+						     (string->number (args:get-arg "-remove-keep"))
+						     actions: actions)))))
 
 (if (args:get-arg "-set-state-status")
     (general-run-call 
      "-set-state-status"
      "set state and status"