Update OpenShiftBuildHelper.groovy

BCDevOps · Jul 12, 2019 · aa81272 · aa81272
1 parent 53abed6
commit aa81272
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/groovy/ca/bc/gov/devops/OpenShiftBuildHelper.groovy b/src/main/groovy/ca/bc/gov/devops/OpenShiftBuildHelper.groovy
@@ -533,8 +533,10 @@ class OpenShiftBuildHelper extends OpenShiftHelper{
                         if ('Waiting' == item.phase) continue
 
                         if (item['build-name']){
-                            if (!waitForPodsToComplete(['pods', '-l', "openshift.io/build.name=${item['build-name'].substring(6)}", "--namespace=${config.app.build.namespace}"])){
-                                throw new RuntimeException("One or more build(s) did NOT complete successfully")
+                            String shortBuildName = item['build-name'].tokenize('/')[1]
+
+                            if (!waitForPodsToComplete(['pods', '-l', "openshift.io/build.name=${shortBuildName}", "--namespace=${config.app.build.namespace}"])){
+                                throw new RuntimeException("'${shortBuildName}' did NOT complete successfully")
                             }
                             //only wait for 1 build/pod to complete at the time
                             break