Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Elasticsearch: run no other test at the same time
ElasticVersionTest: run it through bazel as well
Elasticsearch: cover V5 and flaky V6 tests -for CI
Split Elasticsearch query tests into separate rules
dev-contributing: Document that we format .bzl files with buildifier
Change-Id: I42b9f45dc80156c687a4456b20babadf28ff57a7
diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt
index e065e57..62d73cc 100644
--- a/Documentation/dev-contributing.txt
+++ b/Documentation/dev-contributing.txt
@@ -164,7 +164,7 @@
To format Java source code, Gerrit uses the
link:https://github.com/google/google-java-format[`google-java-format`]
-tool (version 1.5), and to format Bazel BUILD and WORKSPACE files the
+tool (version 1.5), and to format Bazel BUILD, WORKSPACE and .bzl files the
link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`]
tool (version 0.12.0).
These tools automatically apply format according to the style guides; this
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 cdcd959..9cdc2db 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
@@ -19,6 +19,7 @@
labels = [
"docker",
"elastic",
+ "exclusive",
"flaky",
"pgm",
],
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD
index 0fcf7b5..3a8b677 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD
@@ -24,8 +24,9 @@
srcs = ["ElasticIndexIT.java"],
group = "elastic",
labels = [
- "elastic",
"docker",
+ "elastic",
+ "exclusive",
"ssh",
],
deps = [
diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD
index bc437dc..4472f2b 100644
--- a/gerrit-elasticsearch/BUILD
+++ b/gerrit-elasticsearch/BUILD
@@ -48,19 +48,79 @@
],
)
+ELASTICSEARCH_DEPS = [
+ ":elasticsearch",
+ ":elasticsearch_test_utils",
+ "//gerrit-server:query_tests_code",
+ "//gerrit-server:testutil",
+ "//lib:truth",
+ "//lib/guice",
+ "//lib/jgit/org.eclipse.jgit:jgit",
+]
+
+TYPES = [
+ "account",
+ "change",
+ "group",
+]
+
+SUFFIX = "sTest.java"
+
+ELASTICSEARCH_TESTS = {i: "src/test/java/com/google/gerrit/elasticsearch/ElasticQuery" + i.capitalize() + "sTest.java" for i in [
+ "account",
+ "change",
+ "group",
+]}
+
+ELASTICSEARCH_TESTS = {i: "src/test/java/com/google/gerrit/elasticsearch/ElasticQuery" + i.capitalize() + SUFFIX for i in TYPES}
+
+ELASTICSEARCH_TESTS_V5 = {i: "src/test/java/com/google/gerrit/elasticsearch/ElasticV5Query" + i.capitalize() + SUFFIX for i in TYPES}
+
+ELASTICSEARCH_TESTS_V6 = {i: "src/test/java/com/google/gerrit/elasticsearch/ElasticV6Query" + i.capitalize() + SUFFIX for i in TYPES}
+
+ELASTICSEARCH_TAGS = [
+ "docker",
+ "elastic",
+ "exclusive",
+]
+
+[junit_tests(
+ name = "elasticsearch_query_%ss_test" % name,
+ size = "large",
+ srcs = [src],
+ tags = ELASTICSEARCH_TAGS,
+ deps = ELASTICSEARCH_DEPS,
+) for name, src in ELASTICSEARCH_TESTS.items()]
+
+[junit_tests(
+ name = "elasticsearch_query_%ss_test_v5" % name,
+ size = "large",
+ srcs = [src],
+ tags = ELASTICSEARCH_TAGS,
+ deps = ELASTICSEARCH_DEPS,
+) for name, src in ELASTICSEARCH_TESTS_V5.items()]
+
+[junit_tests(
+ name = "elasticsearch_query_%ss_test_v6" % name,
+ size = "large",
+ srcs = [src],
+ tags = ELASTICSEARCH_TAGS,
+ deps = ELASTICSEARCH_DEPS,
+) for name, src in ELASTICSEARCH_TESTS_V6.items()]
+
junit_tests(
name = "elasticsearch_tests",
- size = "large",
- srcs = glob(["src/test/java/**/*Test.java"]),
- tags = [
- "docker",
- "elastic",
- ],
+ size = "small",
+ srcs = glob(
+ ["src/test/java/com/google/gerrit/elasticsearch/*Test.java"],
+ exclude = ["src/test/java/com/google/gerrit/elasticsearch/Elastic*Query*" + SUFFIX],
+ ),
+ tags = ["elastic"],
deps = [
":elasticsearch",
":elasticsearch_test_utils",
- "//gerrit-server:query_tests_code",
"//gerrit-server:testutil",
+ "//lib:guava",
"//lib:truth",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
