From 36c2dbfe041bdcbb6d1cfb7fc9c52c7d637f0414 Mon Sep 17 00:00:00 2001
From: Michal Kovarik <mkovarik@redhat.com>
Date: Jan 06 2020 15:06:01 +0000
Subject: [PATCH 1/2] Add setVars to set more variables as a batch


---

diff --git a/vars/controller.groovy b/vars/controller.groovy
index e2a7a77..7fdc51b 100644
--- a/vars/controller.groovy
+++ b/vars/controller.groovy
@@ -36,6 +36,10 @@ def getVars() {
   return httpGet("/vars", true)
 }
 
+def setVars(Map vars) {
+  return httpPost("/vars", new groovy.json.JsonBuilder(vars).toString())
+}
+
 def getKrb5Vars(String principal) {
   vars = getVars()
   password = httpGet("/krb5/principal/${principal}")

From 6b9e8e2357b3f6cd38a1a1cbc0e92526dbcb6658 Mon Sep 17 00:00:00 2001
From: Michal Kovarik <mkovarik@redhat.com>
Date: Jan 06 2020 15:06:01 +0000
Subject: [PATCH 2/2] Add force cleanup


To speed-up deletion of current containers. Mostly we do not care about
data consistancy, since the containers will not be re-used.

---

diff --git a/src/com/redhat/c3i/util/Deployer.groovy b/src/com/redhat/c3i/util/Deployer.groovy
index c185112..b7ee830 100644
--- a/src/com/redhat/c3i/util/Deployer.groovy
+++ b/src/com/redhat/c3i/util/Deployer.groovy
@@ -89,7 +89,7 @@ class Deployer implements Serializable {
     return dcs
   }
 
-  def Integer cleanup(Integer age=60, String... apps) {
+  def Integer cleanup(Integer age=60, Boolean force=false, String... apps) {
     // age is specified in minutes
     def df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
     df.setTimeZone(TimeZone.getTimeZone("UTC"))
@@ -112,7 +112,11 @@ class Deployer implements Serializable {
     }
     script.echo "Deleting:\n"+todelete.join("\n")
     if (todelete) {
-      script.openshift.delete(todelete.join(' '), "--ignore-not-found=true")
+      def deleteParams = '--ignore-not-found=true'
+      if (force) {
+        deleteParams = deleteParams + " " + "--force=true --grace-period=0"
+      }
+      script.openshift.delete(todelete.join(' '), deleteParams)
     }
     return todelete.size()
   }
diff --git a/vars/c3i.groovy b/vars/c3i.groovy
index 79bb0b5..6325a83 100644
--- a/vars/c3i.groovy
+++ b/vars/c3i.groovy
@@ -12,7 +12,7 @@
  */
 def cleanup(Map args, String... apps) {
   def deployer = new com.redhat.c3i.util.Deployer(script: args.script)
-  return deployer.cleanup(args.age ?: 60, apps as String[])
+  return deployer.cleanup(args.age ?: 60, args.force ?: false, apps as String[])
 }
 
 /**