opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1'

Browse Source 
* stable-3.1:
  Upgrade JGit to v5.6.0.201912041214-rc1
  Update replication plugin to get fixes for IT flakiness
  ElasticV6QueryChangesTest: Add deps to fix build

Change-Id: I267048783027dc41d2a6ecc06bc180c7c8b0508f
This commit is contained in:
David Pursehouse
2019-12-05 14:55:56 +09:00
parent c8a7bfff95 b5fb9432f2
commit f3656860a5
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,11 @@ ELASTICSEARCH_DEPS = [
"//lib:jgit", "//lib:jgit",
] ]
HTTP_TEST_DEPS = [
"//lib/httpcomponents:httpasyncclient",
"//lib/httpcomponents:httpclient",
]
QUERY_TESTS_DEP = "//javatests/com/google/gerrit/server/query/%s:abstract_query_tests" QUERY_TESTS_DEP = "//javatests/com/google/gerrit/server/query/%s:abstract_query_tests"
TYPES = [ TYPES = [
@@ -66,7 +71,7 @@ ELASTICSEARCH_TAGS = [
size = "large", size = "large",
srcs = [src], srcs = [src],
tags = ELASTICSEARCH_TAGS, tags = ELASTICSEARCH_TAGS,
deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name], deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + HTTP_TEST_DEPS,
) for name, src in ELASTICSEARCH_TESTS_V6.items()] ) for name, src in ELASTICSEARCH_TESTS_V6.items()]
[junit_tests( [junit_tests(
@@ -74,10 +79,7 @@ ELASTICSEARCH_TAGS = [
size = "large", size = "large",
srcs = [src], srcs = [src],
tags = ELASTICSEARCH_TAGS, tags = ELASTICSEARCH_TAGS,
deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + [ deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + HTTP_TEST_DEPS,
"//lib/httpcomponents:httpasyncclient",
"//lib/httpcomponents:httpclient",
],
) for name, src in ELASTICSEARCH_TESTS_V7.items()] ) for name, src in ELASTICSEARCH_TESTS_V7.items()]
junit_tests( junit_tests(

2
modules/jgit

Submodule modules/jgit updated: 0356613f48...a7e454bc51

2
plugins/replication

Submodule plugins/replication updated: ef5ffc7508...c72a72058f