From 7e18f1a84a51a247bee7b51ea227a1e4fcf285e6 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Sat, 26 May 2018 17:40:30 +0900
Subject: [PATCH] Add 'docker' tag to build rules for Elasticsearch tests

Split ElasticReindexIT out to its own rule with the labels 'docker' and
'elastic'.

Add a 'docker' label on the Elasticsearch query tests.

This will allow to exclude all the tests that require docker:

  bazel test --test_tag_filters=-docker //...

Currently only the Elasticsearch related tests use docker, so the same
could be achieved by excluding the 'elastic' tag, however it is possible
that in future we will add more tests that use different docker
containers.

Change-Id: Ia67835d96c5863a14a060505f1aece7f4b39a12b
---
 Documentation/dev-bazel.txt                    |  6 ++++++
 .../com/google/gerrit/acceptance/pgm/BUILD     | 18 +++++++++++++++++-
 gerrit-elasticsearch/BUILD                     |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt
index addbef4758..a83ca0d6ab 100644
--- a/Documentation/dev-bazel.txt
+++ b/Documentation/dev-bazel.txt
@@ -239,6 +239,12 @@ To exclude tests that have been marked as flaky:
   bazel test --test_tag_filters=-flaky //...
 ----
 
+To exclude tests that require a Docker host:
+
+----
+  bazel test --test_tag_filters=-docker //...
+----
+
 To ignore cached test results:
 
 ----
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/BUILD
index f405e19902..4bd773c8fd 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/BUILD
@@ -1,7 +1,23 @@
 load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-    srcs = glob(["*IT.java"]),
+    srcs = glob(
+        ["*IT.java"],
+        exclude = ["ElasticReindexIT.java"],
+    ),
     group = "pgm",
     labels = ["pgm"],
 )
+
+acceptance_tests(
+    srcs = [
+        "AbstractReindexIT.java",
+        "ElasticReindexIT.java",
+    ],
+    group = "elastic",
+    labels = [
+        "docker",
+        "elastic",
+        "pgm",
+    ],
+)
diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD
index 09d35fe116..fd7ec0f5e3 100644
--- a/gerrit-elasticsearch/BUILD
+++ b/gerrit-elasticsearch/BUILD
@@ -52,6 +52,7 @@ junit_tests(
     size = "large",
     srcs = glob(["src/test/java/**/*Test.java"]),
     tags = [
+        "docker",
         "elastic",
     ],
     deps = [