From 4faf5cb52b6c48641f7f6d9ef19e3b37986864bb Mon Sep 17 00:00:00 2001
From: Vojtech Horky <vojtech.horky@gmail.com>
Date: Mon, 12 Nov 2018 10:29:59 +0100
Subject: [PATCH] Improvements to CI differential RSS

This patch should improve handling of corner cases such as task
switching between skip and fail status or introduction of a failing
task (i.e. task was not present in previous build and now is failing).
---
 hbuild/web/diff-rss.xsl | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/hbuild/web/diff-rss.xsl b/hbuild/web/diff-rss.xsl
index 06e06de..a7f2758 100644
--- a/hbuild/web/diff-rss.xsl
+++ b/hbuild/web/diff-rss.xsl
@@ -140,9 +140,9 @@
     </xsl:variable>
 
     <xsl:variable name="FIXES_SINCE_LAST_BUILD">
-        <xsl:call-template name="FIND_NEW_FAILURES">
-            <xsl:with-param name="BEFORE" select="$AFTER" />
-            <xsl:with-param name="AFTER" select="$BEFORE" />
+        <xsl:call-template name="FIND_NEW_FIXES">
+            <xsl:with-param name="BEFORE" select="$BEFORE" />
+            <xsl:with-param name="AFTER" select="$AFTER" />
         </xsl:call-template>
     </xsl:variable>
 
@@ -229,28 +229,61 @@
 <xsl:template name="FIND_NEW_FAILURES">
     <xsl:param name="BEFORE" />
     <xsl:param name="AFTER" />
+    <xsl:for-each select="$AFTER/build/*[@result = 'fail']">
+        <xsl:sort />
+        <xsl:variable name="AFTER_LOG" select="./@log" />
+        <xsl:variable name="BEFORE_NODE" select="$BEFORE/build/*[@log=$AFTER_LOG][1]" />
+        <xsl:if test="not($BEFORE_NODE)">
+            <xsl:value-of select="$AFTER_LOG" />
+            <xsl:text> </xsl:text>
+        </xsl:if>
+    </xsl:for-each>
     <xsl:for-each select="$BEFORE/build/*[@result != 'fail']">
         <xsl:sort />
+        <xsl:variable name="BEFORE_RESULT" select="./@result" />
         <xsl:variable name="BEFORE_LOG" select="./@log" />
         <xsl:variable name="AFTER_NODE" select="$AFTER/build/*[@log=$BEFORE_LOG][1]" />
-        <xsl:if test="$AFTER_NODE/@result = 'fail'">
+        <xsl:variable name="AFTER_RESULT" select="$AFTER_NODE/@result" />
+        <xsl:if test="$AFTER_RESULT = 'fail'">
+            <xsl:value-of select="$BEFORE_LOG" />
+            <xsl:text> </xsl:text>
+        </xsl:if>
+        <xsl:if test="($AFTER_RESULT = 'skip') and ($BEFORE_RESULT = 'ok')">
             <xsl:value-of select="$BEFORE_LOG" />
             <xsl:text> </xsl:text>
         </xsl:if>
     </xsl:for-each>
 </xsl:template>
 
+<xsl:template name="FIND_NEW_FIXES">
+    <xsl:param name="BEFORE" />
+    <xsl:param name="AFTER" />
+    <xsl:for-each select="$AFTER/build/*[@result = 'ok']">
+        <xsl:sort />
+        <xsl:variable name="AFTER_RESULT" select="./@result" />
+        <xsl:variable name="AFTER_LOG" select="./@log" />
+        <xsl:variable name="BEFORE_NODE" select="$BEFORE/build/*[@log=$AFTER_LOG][1]" />
+        <xsl:variable name="BEFORE_RESULT" select="$BEFORE_NODE/@result" />
+        <xsl:if test="$BEFORE_RESULT = 'fail'">
+            <xsl:value-of select="$AFTER_LOG" />
+            <xsl:text> </xsl:text>
+        </xsl:if>
+    </xsl:for-each>
+</xsl:template>
+
 <xsl:template name="FIND_PERMANENT_FAILURES">
     <xsl:param name="BEFORE" />
     <xsl:param name="AFTER" />
-    <xsl:for-each select="$BEFORE/build/*[@result = 'fail']">
+    <xsl:for-each select="$BEFORE/build/*[@result != 'ok']">
         <xsl:sort select="name()" />
         <xsl:sort select="@package" />
         <xsl:sort select="@arch" />
         <xsl:sort select="@scenario" />
+        <xsl:variable name="BEFORE_RESULT" select="./@result" />
         <xsl:variable name="BEFORE_LOG" select="./@log" />
         <xsl:variable name="AFTER_NODE" select="$AFTER/build/*[@log=$BEFORE_LOG][1]" />
-        <xsl:if test="$AFTER_NODE/@result = 'fail'">
+        <xsl:variable name="AFTER_RESULT" select="$AFTER_NODE/@result" />
+        <xsl:if test="($AFTER_RESULT != 'ok') and not(($BEFORE_RESULT = 'skip') and ($AFTER_RESULT = 'fail'))">
             <xsl:value-of select="$BEFORE_LOG" />
             <xsl:text> </xsl:text>
         </xsl:if>
-- 
2.11.4.GIT