#40 Avoid exception when checking existing project
Merged 4 years ago by mikeb. Opened 4 years ago by mkovarik.
mkovarik/c3i-library avoid-traceback  into  master

@@ -178,14 +178,14 @@ 

  }

  

  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 {

Method count() on empty selector causes exception.

Pull-Request has been merged by mikeb

4 years ago
Metadata