Add MERGE_FAILURE buildset result

We now report a distinct buildset result to the database if the upstream code
review system is unable to merge a change.  Previously it was reported as
MERGE_CONFLICT which makes it difficult to distinguish from merge conflicts.

Essentially, the two states we're interested in are when Zuul's merger is
unable to prepare a git checkout of the change (99% of the time, this is
a merge conflict).  This is the MERGE_CONFLICT result.

The second state is when Zuul asks Gerrit/Github/etc to submit/merge a change
and the remote system is unable (or refuses) to do so.  This is MERGE_FAILURE.

Change-Id: I47af242aeb19ae4b4aedde353fcc76ff82d90fbe

4 files changed, 12 insertions, 0 deletions

diff --git a/web/src/containers/build/Misc.jsx b/web/src/containers/build/Misc.jsx
index f52fbcd96..51ce1c07a 100644
--- a/web/src/containers/build/Misc.jsx
+++ b/web/src/containers/build/Misc.jsx
@@ -63,6 +63,11 @@ const RESULT_ICON_CONFIGS = {
     color: 'var(--pf-global--warning-color--100)',
     badgeColor: 'orange',
   },
+  MERGE_FAILURE: {
+    icon: ExclamationIcon,
+    color: 'var(--pf-global--warning-color--100)',
+    badgeColor: 'orange',
+  },
   NODE_FAILURE: {
     icon: ExclamationIcon,
     color: 'var(--pf-global--warning-color--100)',
diff --git a/web/src/containers/charts/Misc.jsx b/web/src/containers/charts/Misc.jsx
index d55c459b5..e4e891766 100644
--- a/web/src/containers/charts/Misc.jsx
+++ b/web/src/containers/charts/Misc.jsx
@@ -46,6 +46,11 @@ const buildResultLegendData = [
         symbol: { fill: '#EF9234' },
     },
     {
+        name: 'MERGE_FAILURE',
+        // PF orange-200
+        symbol: { fill: '#EF9234' },
+    },
+    {
         name: 'NODE_FAILURE',
         // PF orange-300
         symbol: { fill: '#EC7A08' },
diff --git a/web/src/pages/Builds.jsx b/web/src/pages/Builds.jsx
index 0e76a73be..7165e143b 100644
--- a/web/src/pages/Builds.jsx
+++ b/web/src/pages/Builds.jsx
@@ -83,6 +83,7 @@ class BuildsPage extends React.Component {
           'SKIPPED',
           'NODE_FAILURE',
           'MERGE_CONFLICT',
+          'MERGE_FAILURE',
           'CONFIG_ERROR',
           'TIMED_OUT',
           'CANCELED',
diff --git a/web/src/pages/Buildsets.jsx b/web/src/pages/Buildsets.jsx
index 382df5eb2..98d86d640 100644
--- a/web/src/pages/Buildsets.jsx
+++ b/web/src/pages/Buildsets.jsx
@@ -71,6 +71,7 @@ class BuildsetsPage extends React.Component {
           'SUCCESS',
           'FAILURE',
           'MERGE_CONFLICT',
+          'MERGE_FAILURE',
           'DEQUEUED',
         ]
       },