From 4060fa4d2edec5210bc246eb445208ae6bf66d15 Mon Sep 17 00:00:00 2001
From: Alberto Fanjul <afanjula@redhat.com>
Date: Thu, 3 Oct 2024 16:10:02 +0200
Subject: [PATCH] fix e2e result junit format

---
 images/build-e2e/lib/darwin/filter.xsl  | 19 +++++++++++++++++++
 images/build-e2e/lib/darwin/run.sh      |  2 +-
 images/build-e2e/lib/linux/filter.xsl   | 19 +++++++++++++++++++
 images/build-e2e/lib/linux/run.sh       |  2 +-
 images/build-e2e/lib/windows/filter.xsl | 19 +++++++++++++++++++
 images/build-e2e/lib/windows/run.ps1    |  6 +++++-
 6 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 images/build-e2e/lib/darwin/filter.xsl
 create mode 100644 images/build-e2e/lib/linux/filter.xsl
 create mode 100644 images/build-e2e/lib/windows/filter.xsl

diff --git a/images/build-e2e/lib/darwin/filter.xsl b/images/build-e2e/lib/darwin/filter.xsl
new file mode 100644
index 0000000000..7bd4f28f45
--- /dev/null
+++ b/images/build-e2e/lib/darwin/filter.xsl
@@ -0,0 +1,19 @@
+<xsl:stylesheet version="1.0" 
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+<xsl:strip-space elements="*"/>
+
+<!-- identity transform -->
+<xsl:template match="@*|node()">
+    <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+</xsl:template>
+
+<xsl:template match="failure">
+    <xsl:copy>
+        <xsl:value-of select="@message"/>
+    </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/images/build-e2e/lib/darwin/run.sh b/images/build-e2e/lib/darwin/run.sh
index 0b417f56bc..ebceff565e 100755
--- a/images/build-e2e/lib/darwin/run.sh
+++ b/images/build-e2e/lib/darwin/run.sh
@@ -55,6 +55,6 @@ cd $targetFolder/bin
 # Transform results to junit
 cd ..
 init_line=$(grep -n '<?xml version="1.0" encoding="UTF-8"?>' results/e2e.results | awk '{split($0,n,":"); print n[1]}')
-tail -n +$init_line results/e2e.results > results/$junitFilename
+tail -n +$init_line results/e2e.results | xsltproc filter.xsl > results/$junitFilename
 # Copy logs and diagnose
 cp -r bin/out/test-results/* results
\ No newline at end of file
diff --git a/images/build-e2e/lib/linux/filter.xsl b/images/build-e2e/lib/linux/filter.xsl
new file mode 100644
index 0000000000..7bd4f28f45
--- /dev/null
+++ b/images/build-e2e/lib/linux/filter.xsl
@@ -0,0 +1,19 @@
+<xsl:stylesheet version="1.0" 
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+<xsl:strip-space elements="*"/>
+
+<!-- identity transform -->
+<xsl:template match="@*|node()">
+    <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+</xsl:template>
+
+<xsl:template match="failure">
+    <xsl:copy>
+        <xsl:value-of select="@message"/>
+    </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/images/build-e2e/lib/linux/run.sh b/images/build-e2e/lib/linux/run.sh
index 94fe5737da..244ca3730b 100755
--- a/images/build-e2e/lib/linux/run.sh
+++ b/images/build-e2e/lib/linux/run.sh
@@ -55,6 +55,6 @@ cd $targetFolder/bin
 # Transform results to junit
 cd ..
 init_line=$(grep -n '<?xml version="1.0" encoding="UTF-8"?>' results/e2e.results | awk '{split($0,n,":"); print n[1]}')
-tail -n +$init_line results/e2e.results > results/$junitFilename
+tail -n +$init_line results/e2e.results | xsltproc filter.xsl > results/$junitFilename
 # Copy logs and diagnose
 cp -r bin/out/test-results/* results
\ No newline at end of file
diff --git a/images/build-e2e/lib/windows/filter.xsl b/images/build-e2e/lib/windows/filter.xsl
new file mode 100644
index 0000000000..7bd4f28f45
--- /dev/null
+++ b/images/build-e2e/lib/windows/filter.xsl
@@ -0,0 +1,19 @@
+<xsl:stylesheet version="1.0" 
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+<xsl:strip-space elements="*"/>
+
+<!-- identity transform -->
+<xsl:template match="@*|node()">
+    <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+</xsl:template>
+
+<xsl:template match="failure">
+    <xsl:copy>
+        <xsl:value-of select="@message"/>
+    </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/images/build-e2e/lib/windows/run.ps1 b/images/build-e2e/lib/windows/run.ps1
index 9fd2488538..ed0f3b9386 100755
--- a/images/build-e2e/lib/windows/run.ps1
+++ b/images/build-e2e/lib/windows/run.ps1
@@ -30,6 +30,10 @@ e2e.test.exe --bundle-location=$bundleLocation --pull-secret-file=$env:HOME\$tar
 # Transform results to junit
 cd ..
 $r = Select-String -Pattern '<?xml version="1.0" encoding="UTF-8"?>' -Path results\e2e.results -list -SimpleMatch | select-object -First 1
-Get-Content results\e2e.results | Select -skip ($r.LineNumber -1) > results\$junitFilename
+Get-Content results\e2e.results | Select -skip ($r.LineNumber -1) > results\$junitFilename.pre
+$xslt = New-Object System.Xml.Xsl.XslCompiledTransform;
+$xslt.load( Get-content "filter.xsl" )
+$xslt.transform( Get-Content results\$junitFilename.pre, results\$junitFilename )
+rm results\$junitFilename.pre
 # Copy logs and diagnose
 cp -r bin\out\test-results\* results
\ No newline at end of file