opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16'

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

Change-Id: I8483fe8948510979baacc078e61b21ee8a10f85f
This commit is contained in:
David Pursehouse
2019-03-13 08:39:37 +09:00
parent d8e0f9d661 164d7feeec
commit dc85f27a25
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
javatests/com/google/gerrit/acceptance/pgm/BUILD
View File

@@ -26,7 +26,6 @@ acceptance_tests(
"docker", "docker",
"elastic", "elastic",
"exclusive", "exclusive",
"flaky",
"pgm", "pgm",
"no_windows", "no_windows",
], ],

4
javatests/com/google/gerrit/elasticsearch/BUILD
View File

@@ -65,7 +65,7 @@ ELASTICSEARCH_TAGS = [
name = "elasticsearch_query_%ss_test_V6" % name, name = "elasticsearch_query_%ss_test_V6" % name,
size = "large", size = "large",
srcs = [src], srcs = [src],
tags = ELASTICSEARCH_TAGS + ["flaky"], tags = ELASTICSEARCH_TAGS,
deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name], deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name],
) for name, src in ELASTICSEARCH_TESTS_V6.items()] ) for name, src in ELASTICSEARCH_TESTS_V6.items()]
@@ -73,7 +73,7 @@ ELASTICSEARCH_TAGS = [
name = "elasticsearch_query_%ss_test_V7" % name, name = "elasticsearch_query_%ss_test_V7" % name,
size = "large", size = "large",
srcs = [src], srcs = [src],
tags = ELASTICSEARCH_TAGS + ["flaky"], tags = ELASTICSEARCH_TAGS,
deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + [ deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + [
"//lib/httpcomponents:httpasyncclient", "//lib/httpcomponents:httpasyncclient",
"//lib/httpcomponents:httpclient", "//lib/httpcomponents:httpclient",