commit 3571c69fd33bdea18f3ab92e24a8b16a83c81226
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Mar 28 19:57:36 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Mar 28 19:57:36 2019 +0000
tree 990ef440ff4d7dc9e89a8bc8be2ab340e52a886b
parent eb7e748608e0cf9aa0486835869464b3a5b0d3ca
parent 7e28c153cf88e63b408c62a03b737acb4a2af6ce

Merge "Define stages for conformance run inside k8s upgrade pipeline" into release/2019.2.0

k8s-upgrade-pipeline.groovy

diff --git a/k8s-upgrade-pipeline.groovy b/k8s-upgrade-pipeline.groovy
index 4e75e11..2d403e5 100644
--- a/k8s-upgrade-pipeline.groovy
+++ b/k8s-upgrade-pipeline.groovy
@@ -268,7 +268,7 @@
    def nodeShortName = target.tokenize(".")[0]
    firstTarget = salt.getFirstMinion(pepperEnv, originalTarget)
 
-   status = salt.cmdRun(pepperEnv, firstTarget, "kubectl get no | grep ${nodeShortName} | awk '{print \$2}'"
+   status = salt.cmdRun(pepperEnv, firstTarget, "kubectl get no ${nodeShortName} | tail -n+2 | awk '{print \$2}'"
    )['return'][0].values()[0].replaceAll('Salt command execution success',''
    ).replaceAll(',SchedulingDisabled','').trim()