opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  ElasticQueryAdapter: Move isV6 method to ElasticVersion and simplify
  Account.java: introduce compiled pattern and use where applicable
  Optimize USER_NAME_PATTERN string and its usage
  ElasticContainer: Test against Elasticsearch version 5.6.11

Change-Id: I9dc62b986007c3c06fd8efd2331aaab61f9c2dc7
This commit is contained in:
David Pursehouse
2018-09-04 11:16:23 +09:00
parent 88c80e4073 088f2d438a
commit 456ce230a9
12 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -45,7 +45,7 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
case V2_4:
return "elasticsearch:2.4.6-alpine";
case V5_6:
return "docker.elastic.co/elasticsearch/elasticsearch:5.6.10";
return "docker.elastic.co/elasticsearch/elasticsearch:5.6.11";
case V6_2:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4";
case V6_3:

7
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java
View File

@@ -46,4 +46,11 @@ public class ElasticVersionTest {
"Invalid version: [4.0.0]. Supported versions: " + ElasticVersion.supportedVersions());
ElasticVersion.forVersion("4.0.0");
}
@Test
public void version6() throws Exception {
assertThat(ElasticVersion.V6_2.isV6()).isTrue();
assertThat(ElasticVersion.V6_3.isV6()).isTrue();
assertThat(ElasticVersion.V5_6.isV6()).isFalse();
}
}