From c272ddfbaf10e813e5bbdd46483db09e0eb33f80 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Thu, 5 Nov 2015 11:50:24 -0800
Subject: [PATCH] Filter non-voting jobs from the uncategorized bugs page

Change I1f3c2a65104db39fdd7d786d421cded1b436a5f6 added the 'voting'
field which has been tracking results for a couple of weeks now, so
let's use it to filter the initial set of results for the uncategorized
bugs page.

Change-Id: If66c9f5f2f0dea344f941a6a072ff0c30a86e7f2
---
 README.rst                                 | 8 +++-----
 elastic_recheck/cmd/uncategorized_fails.py | 3 ++-
 web/share/templates/uncategorized.html     | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index 82042d6e..f1523dc9 100644
--- a/README.rst
+++ b/README.rst
@@ -137,9 +137,9 @@ stack that can cause many tempest tests to fail.
    and push the patch up for review.
 
 You can also help classify `Unclassified failed jobs
-<http://status.openstack.org/elastic-recheck/data/uncategorized.html>`_, which is
-an aggregation of all failed gate jobs that don't currently have elastic-recheck
-fingerprints.
+<http://status.openstack.org/elastic-recheck/data/uncategorized.html>`_, which
+is an aggregation of all failed voting gate jobs that don't currently have
+elastic-recheck fingerprints.
 
 
 Removing Bug Signatures
@@ -210,5 +210,3 @@ Future Work
 - Move away from polling ElasticSearch to discover if its ready or not
 - Add nightly job to propose a patch to remove bug queries that return
   no hits -- Bug hasn't been seen in 2 weeks and must be closed
-- Store whether or not the job is non-voting in ElasticSearch so that we can
-  filter non-voting jobs from the uncategorized bugs page.
diff --git a/elastic_recheck/cmd/uncategorized_fails.py b/elastic_recheck/cmd/uncategorized_fails.py
index 0c9a501a..74e1324e 100755
--- a/elastic_recheck/cmd/uncategorized_fails.py
+++ b/elastic_recheck/cmd/uncategorized_fails.py
@@ -78,7 +78,8 @@ def all_fails(classifier):
     all_fails = {}
     query = ('filename:"console.html" '
              'AND message:"Finished: FAILURE" '
-             'AND build_queue:"gate"')
+             'AND build_queue:"gate" '
+             'AND voting:"1"')
     results = classifier.hits_by_query(query, size=30000)
     facets = er_results.FacetSet()
     facets.detect_facets(results, ["build_uuid"])
diff --git a/web/share/templates/uncategorized.html b/web/share/templates/uncategorized.html
index 6fd462cf..8b300b82 100644
--- a/web/share/templates/uncategorized.html
+++ b/web/share/templates/uncategorized.html
@@ -82,7 +82,7 @@
 {% endfor %}
 </div>
 <div class='crm114-verbiage'>
-Failures on this page are collected from all gate failures that don't match current elastic-recheck bug fingerprints.<br>
+Failures on this page are collected from all voting gate failures that don't match current elastic-recheck bug fingerprints.<br>
 The crm114 links are logstash queries showing log messages that have been flagged as potential errors.<br>
 More information on the system can be found <a href="http://docs.openstack.org/infra/system-config/logstash.html#crm114">here</a>
 </div>