commit b364dceb75b0724717b8e4ff684aad093fdb04ea
author You Wang <you@opennetworking.org> Mon Sep 11 13:46:43 2017 -0700
committer Luca Prete <luca@opennetworking.org> Mon Sep 11 14:43:35 2017 -0700
tree 296c31c093fe1db83157e4c8159982a419d985e4
parent cebbd3187ae3c9523bc68c4a9f1ed524c6d224f0

Fix Jenkins verifications for compute-node provisioning

Change-Id: Iaedd80577fd3607da9df0b00259986dba1a3cfa5
(cherry picked from commit 4e0c2ede8552a7fcbf0ceecd98f0cc9998d7919f)

Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index f41b31f..4c542b7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -113,19 +113,15 @@
                     }
                 }
 
-                stage ("Wait for computes nodes to be provisioned") {
-                    ip = runCmd("${config.head.ip}",
-                                "${config.head.user}",
-                                "${config.head.pass}",
-                                "docker inspect --format '{{.NetworkSettings.Networks.maas_default.IPAddress}}' provisioner").trim()
+                stage ("Wait for compute nodes to be provisioned") {
                     timeout(time:45) {
                         waitUntil {
                             try {
-                                out = runCmd("${config.head.ip}",
+                                num = runCmd("${config.head.ip}",
                                              "${config.head.user}",
                                              "${config.head.pass}",
-                                             "curl -sS http://$ip:4243/provision/ | jq -c \".[] | select(.status | contains(${config.compute_nodes.size()}))\"".trim())
-                                return out != ""
+                                             "cord prov list '|' grep -i node '|' grep -i complete '|' wc -l").trim()
+                                return num.toInteger() == config.compute_nodes.size()
                             } catch (exception) {
                                 return false
                             }