commit 3f9329cb0c9791de0dacb2a3d791f24694ed57eb
author Dennis Dmitriev <ddmitriev@mirantis.com> Thu Aug 30 18:17:49 2018 +0300
committer Dennis Dmitriev <ddmitriev@mirantis.com> Thu Aug 30 21:34:37 2018 +0300
tree c8d3475ef52e0ad85ef6a0628457066cdf7ff857
parent 9eca4e71d93555ae250d56aa4becd055a37e66f3

Switch computes in cicd-k8s deployments from generation to inventory

Auto-registration for k8s compute nodes has been introduced to CC,
but there is no inventory provider to use it for 'auto' registration.

For testing, use custom inventory provider (fuel-devops) and mapping
(environment-templates),

Change-Id: I2665040ae772003e98336697383d355577f16e57

src/com/mirantis/system_qa/SharedPipeline.groovy

diff --git a/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index 123a667..775b901 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -81,8 +81,8 @@
 
             def String junit_report_xml = readFile("${junit_report_filename}")
             def String junit_report_xml_pretty = new XmlUtil().serialize(junit_report_xml)
-            def String junit_report_xml_headless = junit_report_xml_pretty.replaceAll("<\\?xml version=\"1.0\" encoding=\"UTF-8\"\\?>","");
-            def String junit_report_xml_filtered = junit_report_xml_headless.replaceAll("<","&lt;").replaceAll(">", "&gt;")
+            // Replace '<' and '>' to '&lt;' and '&gt;' to avoid conflicts between xml tags in the message and JUnit report
+            def String junit_report_xml_filtered = junit_report_xml_pretty.replaceAll("<","&lt;").replaceAll(">", "&gt;")
             def String msg = "Job '${job_url}' failed with status ${build_status}, JUnit report:\n"
             throw new Exception(msg + junit_report_xml_filtered)
         } else {