Merge "Add ability to test model against Reclass source code"
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index e125f50..102ec2b 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -452,7 +452,7 @@
def _pillar = salt.getPillar(master, 'I@kubernetes:master and *01*', 'kubernetes:master')
def kubernetes = _pillar['return'][0].values()[0]
env_vars = [
- "KUBERNETES_HOST=${kubernetes.apiserver.vip_address}" +
+ "KUBERNETES_HOST=http://${kubernetes.apiserver.vip_address}" +
":${kubernetes.apiserver.insecure_port}",
"KUBERNETES_CERT_AUTH=${dest_folder}/k8s-ca.crt",
"KUBERNETES_CLIENT_KEY=${dest_folder}/k8s-client.key",
@@ -494,8 +494,11 @@
break
}
}
- cmd_rally_report= "rally task export --type junit-xml --to ${dest_folder}/report-rally.xml; " +
- "rally task report --out ${dest_folder}/report-rally.html"
+ cmd_rally_report= "rally task export --uuid \\\$(rally task list --uuids-only --status finished) " +
+ "--type junit-xml --to ${dest_folder}/report-rally.xml; " +
+ "rally task report --uuid \\\$(rally task list --uuids-only --status finished) " +
+ "--out ${dest_folder}/report-rally.html"
+
full_cmd = 'set -xe; ' + cmd_rally_plugins +
cmd_rally_init + cmd_rally_checkout +
'set +e; ' + cmd_rally_start +