From ff8ebe7df1fa21d5257a2913d0e659220de406b1 Mon Sep 17 00:00:00 2001 From: Michal Kovarik Date: May 13 2020 08:02:03 +0000 Subject: Fix: check project deletion from list of projects Using count() on project which does not exist returns exception because user is forbidden to access the project resource - it is not possible to detect if project does not exist or user does not have access to project. Checking list of available project instead counting project. Selector is dynamically updated each call. --- diff --git a/vars/c3iaasRequestProjectJob.groovy b/vars/c3iaasRequestProjectJob.groovy index 4e36b79..299d71c 100644 --- a/vars/c3iaasRequestProjectJob.groovy +++ b/vars/c3iaasRequestProjectJob.groovy @@ -174,7 +174,7 @@ def deleteProjectIfExists(String projectName) { echo "Deleting project ${projectName}..." projectSelector.delete() timeout(time: 5, unit: 'MINUTES') { - while(openshift.selector('project', projectName).count() == 1) { + while(projectsSelector.names().contains("project/" + projectName)) { echo "Project ${projectName} is still available, waiting" sleep(time:2, unit:"SECONDS") }