From a895ab2c404eeea6cd4f1342eb227393b6210a1c Mon Sep 17 00:00:00 2001 From: Michal Kovarik Date: Jan 29 2020 12:38:26 +0000 Subject: Avoid exception when checking existing project Method count() on empty selector causes exception. --- diff --git a/vars/c3iaasRequestProjectJob.groovy b/vars/c3iaasRequestProjectJob.groovy index d7fb7fd..e944ac2 100644 --- a/vars/c3iaasRequestProjectJob.groovy +++ b/vars/c3iaasRequestProjectJob.groovy @@ -178,14 +178,14 @@ def validateUserNames(String[] userNames) { } def deleteProjectIfExists(String projectName) { - def projectSelector = openshift.selector('project', projectName) + def projectsSelector = openshift.selector('project') echo "Checking if project ${projectName} exists..." - if (projectSelector.count() < 1) { + if (! projectsSelector.names().contains("project/${projectName}")) { echo "Project ${projectName} doesn't exist" return false } // check if the existing project is managed by C3IaaS - def project = projectSelector.object() + def project = openshift.selector('project', projectName).object() def projectMetadataString = project.metadata.annotations["openshift.io/description"] try {