Fix underlay.get_logs() method
- use salt minions instead of underlay SSH to get logs from
all registered nodes
- use IP addresses from underlay.config_ssh for such nodes
which hostnames not matched any minion
- archive the full dump of logs to /tmp instead of /root
(archiving to /root caused duplicates in the archive at the
second time)
- use ${ENV_NAME} as part of the name of the archive in CICD
jobs
Change-Id: I21e6f5cb8eff6c5bccc707c5c88e509a7bf3a166
diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
index 36ea29a..7b2ff15 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
@@ -108,7 +108,7 @@
} catch (e) {
common.printMsg("Saltstack cluster deploy is failed", "purple")
if (fileExists(xml_report_name)) {
- shared.download_logs("deploy_salt")
+ shared.download_logs("deploy_salt_${ENV_NAME}")
def String junit_report_xml = readFile(xml_report_name)
def String junit_report_xml_pretty = new XmlUtil().serialize(junit_report_xml)
throw new Exception(junit_report_xml_pretty)