commit dc85f27a25d5a41e0bbe308d3b4fd75e909f52df
author David Pursehouse <dpursehouse@collab.net> Wed Mar 13 08:39:37 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Mar 13 08:39:37 2019 +0900
tree ca009d1b642211ccde9bfcb1b4708b1cc53f38a1
parent d8e0f9d661e51e7dbfa8757bb6097c5438961ff4
parent 164d7feeec15205da4b57d84bacb7e33e1072a2a

Merge branch 'stable-2.16'

* stable-2.16:
  Elasticsearch tests: Remove the flaky tag from BUILD files

Change-Id: I8483fe8948510979baacc078e61b21ee8a10f85f

javatests/com/google/gerrit/acceptance/pgm/BUILD

diff --git a/javatests/com/google/gerrit/acceptance/pgm/BUILD b/javatests/com/google/gerrit/acceptance/pgm/BUILD
index e8cf516..e0ed78a 100644
--- a/javatests/com/google/gerrit/acceptance/pgm/BUILD
+++ b/javatests/com/google/gerrit/acceptance/pgm/BUILD
@@ -26,7 +26,6 @@
         "docker",
         "elastic",
         "exclusive",
-        "flaky",
         "pgm",
         "no_windows",
     ],

javatests/com/google/gerrit/elasticsearch/BUILD

diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD
index 62c3fe1..a2bd092 100644
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@@ -65,7 +65,7 @@
     name = "elasticsearch_query_%ss_test_V6" % name,
     size = "large",
     srcs = [src],
-    tags = ELASTICSEARCH_TAGS + ["flaky"],
+    tags = ELASTICSEARCH_TAGS,
     deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name],
 ) for name, src in ELASTICSEARCH_TESTS_V6.items()]
 
@@ -73,7 +73,7 @@
     name = "elasticsearch_query_%ss_test_V7" % name,
     size = "large",
     srcs = [src],
-    tags = ELASTICSEARCH_TAGS + ["flaky"],
+    tags = ELASTICSEARCH_TAGS,
     deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + [
         "//lib/httpcomponents:httpasyncclient",
         "//lib/httpcomponents:httpclient",