opendev/gerrit
Code Issues Proposed changes

Elasticsearch: Add support and tests for version 7.2

Browse Source 
Switch the test container version to 7.2.0 for the Elastic[Re]indexIT
and ElasticV7Query{Accounts,Changes,Groups}Test tests.

Upgrade the elasticsearch-rest-client version to 7.2.0.

Change-Id: I0af1f45c183af72f929417507d97a90128fca1e7
This commit is contained in:
Marco Miller
2019-06-26 10:15:55 -04:00
committed by Luca Milanesio
parent 4278441e34
commit 70dd2bfa65
9 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@@ -925,8 +925,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.1.1",
sha1 = "ca04d8012f92cac561be343b931ec73302b2ff3e",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.2.0",
sha1 = "39cf34068b0af284eaa9b8bd86a131cb24b322d5",
)
maven_jar(

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
View File

@@ -37,7 +37,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
@ConfigSuite.Config
public static Config elasticsearchV7() {
return getConfig(ElasticVersion.V7_1);
return getConfig(ElasticVersion.V7_2);
}
@Override

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
View File

@@ -36,7 +36,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
@ConfigSuite.Config
public static Config elasticsearchV7() {
return getConfig(ElasticVersion.V7_1);
return getConfig(ElasticVersion.V7_2);
}
@Override

3
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java
View File

@@ -26,7 +26,8 @@ public enum ElasticVersion {
V6_6("6.6.*"),
V6_7("6.7.*"),
V7_0("7.0.*"),
V7_1("7.1.*");
V7_1("7.1.*"),
V7_2("7.2.*");
private final String version;
private final Pattern pattern;

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

@@ -54,6 +54,8 @@ public class ElasticContainer extends ElasticsearchContainer {
return "blacktop/elasticsearch:7.0.1";
case V7_1:
return "blacktop/elasticsearch:7.1.1";
case V7_2:
return "blacktop/elasticsearch:7.2.0";
}
throw new IllegalStateException("No tests for version: " + version.name());
}

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

@@ -34,7 +34,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_1);
container = ElasticContainer.createAndStart(ElasticVersion.V7_2);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

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

@@ -41,7 +41,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_1);
container = ElasticContainer.createAndStart(ElasticVersion.V7_2);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
client = HttpAsyncClients.createDefault();
client.start();

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

@@ -34,7 +34,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_1);
container = ElasticContainer.createAndStart(ElasticVersion.V7_2);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

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

@@ -51,6 +51,9 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.forVersion("7.1.0")).isEqualTo(ElasticVersion.V7_1);
assertThat(ElasticVersion.forVersion("7.1.1")).isEqualTo(ElasticVersion.V7_1);
assertThat(ElasticVersion.forVersion("7.2.0")).isEqualTo(ElasticVersion.V7_2);
assertThat(ElasticVersion.forVersion("7.2.1")).isEqualTo(ElasticVersion.V7_2);
}
@Test
@@ -72,6 +75,7 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V6_7.isAtLeastMinorVersion(ElasticVersion.V6_7)).isTrue();
assertThat(ElasticVersion.V7_0.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V7_1.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V7_2.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
}
@Test
@@ -85,6 +89,7 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V6_7.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_0.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_1.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_2.isV6OrLater()).isTrue();
}
@Test
@@ -98,5 +103,6 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V6_7.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V7_0.isV7OrLater()).isTrue();
assertThat(ElasticVersion.V7_1.isV7OrLater()).isTrue();
assertThat(ElasticVersion.V7_2.isV7OrLater()).isTrue();
}
}