From 24fa895cd21f59a2338d1686b4b757bc516ba521 Mon Sep 17 00:00:00 2001
From: Michal Kovarik <mkovarik@redhat.com>
Date: Nov 27 2019 06:10:30 +0000
Subject: Wait until the project is deleted


---

diff --git a/vars/c3iaasRequestProjectJob.groovy b/vars/c3iaasRequestProjectJob.groovy
index dcb6ea5..d7fb7fd 100644
--- a/vars/c3iaasRequestProjectJob.groovy
+++ b/vars/c3iaasRequestProjectJob.groovy
@@ -178,10 +178,10 @@ def validateUserNames(String[] userNames) {
 }
 
 def deleteProjectIfExists(String projectName) {
-  def projectSelector = openshift.selector('project', env.PROJECT_NAME)
-  echo "Checking if project ${env.PROJECT_NAME} exists..."
+  def projectSelector = openshift.selector('project', projectName)
+  echo "Checking if project ${projectName} exists..."
   if (projectSelector.count() < 1) {
-    echo "Project ${env.PROJECT_NAME} doesn't exist"
+    echo "Project ${projectName} doesn't exist"
     return false
   }
   // check if the existing project is managed by C3IaaS
@@ -197,9 +197,15 @@ def deleteProjectIfExists(String projectName) {
     error("Aborting becasue project $projectName does not seem to be managed by C3IaaS: $e")
   }
 
-  echo "Deleting project ${env.PROJECT_NAME}..."
+  echo "Deleting project ${projectName}..."
   projectSelector.delete()
-  echo "Project ${env.PROJECT_NAME} deleted"
+  timeout(time: 5, unit: 'MINUTES') {
+    while(openshift.selector('project', projectName).count() == 1) {
+      echo "Project ${projectName} is still available, waiting"
+      sleep(time:2, unit:"SECONDS")
+    }
+  }
+  echo "Project ${projectName} deleted"
   return true
 }