#43 Fix project detection
Merged 4 years ago by mikeb. Opened 4 years ago by mkovarik.
mkovarik/c3i-library fix-project-detection  into  master

@@ -180,12 +180,13 @@ 

  def deleteProjectIfExists(String projectName) {

    def projectsSelector = openshift.selector('project')

    echo "Checking if project ${projectName} exists..."

-   if (! projectsSelector.names().contains("project/${projectName}")) {

+   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 = openshift.selector('project', projectName).object()

+   def projectSelector = openshift.selector('project', projectName)

+   def project = projectSelector.object()

  

    def projectMetadataString = project.metadata.annotations["openshift.io/description"]

    try {

no initial comment

@mikeb please check. Do you have an idea why it did not work?
println(projectsSelector.names().contains("project/c3i-carawang-123")) -> True
println(projectsSelector.names().contains("project/${projectName}")) -> False
println(projectsSelector.names().contains("project/" + projectName)) -> True

@mkovarik Maybe it's a String vs. GString comparison problem? I've seen that in a couple places. Did you try:

.contains("project/${projectName}" as String)

?

rebased onto b34cde4d72ba48d50c88d49d17dfd019db829236

4 years ago

Did you want to leave this PR as-is, or change it?

rebased onto 10edeb3d2391275fb11a6f22bd042614752e4e3b

4 years ago

rebased onto 1e586775fa59c6bb84a48308f730f894c162a2ae

4 years ago

rebased onto d639662

4 years ago

Pull-Request has been merged by mikeb

4 years ago
Metadata