opendev/gerrit
Code Issues Proposed changes

Add support for Elasticsearch version 7.10.*

Browse Source 
Upgrade elasticsearch-rest-client to 7.10.1.

Add V7_10 to the version manager and use it for all the V7 tests.

Change-Id: Ifb941eea63b90e107ae37c6a08ab1815d6c0f22b
This commit is contained in:
Marco Miller
2020-12-07 15:57:38 -05:00
parent df16e3f0ff
commit aa4789722e
10 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/elasticsearch/ElasticVersion.java
View File

@@ -25,7 +25,8 @@ public enum ElasticVersion {
V7_6("7.6.*"),
V7_7("7.7.*"),
V7_8("7.8.*"),
V7_9("7.9.*");
V7_9("7.9.*"),
V7_10("7.10.*");
private final String version;
private final Pattern pattern;

2
javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
View File

@@ -26,7 +26,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
@ConfigSuite.Default
public static Config elasticsearchV7() {
return getConfig(ElasticVersion.V7_9);
return getConfig(ElasticVersion.V7_10);
}
@Override

2
javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
View File

@@ -28,7 +28,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
@ConfigSuite.Default
public static Config elasticsearchV7() {
return getConfig(ElasticVersion.V7_9);
return getConfig(ElasticVersion.V7_10);
}
@Override

2
javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -55,6 +55,8 @@ public class ElasticContainer extends ElasticsearchContainer {
return "blacktop/elasticsearch:7.8.1";
case V7_9:
return "blacktop/elasticsearch:7.9.3";
case V7_10:
return "blacktop/elasticsearch:7.10.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
View File

@@ -36,7 +36,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
public static void startIndexService() {
if (container == null) {
// Only start Elasticsearch once
container = ElasticContainer.createAndStart(ElasticVersion.V7_9);
container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
}
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
View File

@@ -46,7 +46,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest {
public static void startIndexService() {
if (container == null) {
// Only start Elasticsearch once
container = ElasticContainer.createAndStart(ElasticVersion.V7_9);
container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
client = HttpAsyncClients.createDefault();
client.start();
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
View File

@@ -36,7 +36,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest {
public static void startIndexService() {
if (container == null) {
// Only start Elasticsearch once
container = ElasticContainer.createAndStart(ElasticVersion.V7_9);
container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
}
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
View File

@@ -36,7 +36,7 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest {
public static void startIndexService() {
if (container == null) {
// Only start Elasticsearch once
container = ElasticContainer.createAndStart(ElasticVersion.V7_9);
container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
}
}

3
javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
View File

@@ -45,6 +45,9 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.forVersion("7.9.0")).isEqualTo(ElasticVersion.V7_9);
assertThat(ElasticVersion.forVersion("7.9.1")).isEqualTo(ElasticVersion.V7_9);
assertThat(ElasticVersion.forVersion("7.10.0")).isEqualTo(ElasticVersion.V7_10);
assertThat(ElasticVersion.forVersion("7.10.1")).isEqualTo(ElasticVersion.V7_10);
}
@Test

4
tools/nongoogle.bzl
View File

@@ -103,8 +103,8 @@ def declare_nongoogle_deps():
# org.apache.httpcomponents dependencies in ../WORKSPACE.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.9.3",
sha1 = "0b621621ecc6a8d9b536334d5f3301940302efd2",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.10.1",
sha1 = "b2e89d266c2c0039a69504f78c9230582ea095ee",
)
maven_jar(