| |
@@ -178,10 +178,10 @@
|
| |
}
|
| |
|
| |
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 @@
|
| |
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
|
| |
}
|
| |
|
| |
