opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1' into stable-3.2

Browse Source 
* stable-3.1:
  Fix documentation of `container.slave`
  Update git submodules
  Add support for Elasticsearch version 7.8.*

Change-Id: I2492d62589c7dc959dd5d0c900e3b4abdf92d3ef
This commit is contained in:
David Pursehouse
2020-06-22 09:18:58 +09:00
parent 544b061dbd dcd731f5a6
commit 7bb4a113cf
10 changed files with 18 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

@@ -28,7 +28,8 @@ public enum ElasticVersion {
V7_4("7.4.*"),
V7_5("7.5.*"),
V7_6("7.6.*"),
V7_7("7.7.*");
V7_7("7.7.*"),
V7_8("7.8.*");
private final String version;
private final Pattern pattern;

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

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

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

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

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

@@ -60,6 +60,8 @@ public class ElasticContainer extends ElasticsearchContainer {
return "blacktop/elasticsearch:7.6.2";
case V7_7:
return "blacktop/elasticsearch:7.7.1";
case V7_8:
return "blacktop/elasticsearch:7.8.0";
}
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_7);
container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
}
}

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_7);
container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
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_7);
container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
}
}

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_7);
container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
}
}

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

@@ -54,6 +54,9 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.forVersion("7.7.0")).isEqualTo(ElasticVersion.V7_7);
assertThat(ElasticVersion.forVersion("7.7.1")).isEqualTo(ElasticVersion.V7_7);
assertThat(ElasticVersion.forVersion("7.8.0")).isEqualTo(ElasticVersion.V7_8);
assertThat(ElasticVersion.forVersion("7.8.1")).isEqualTo(ElasticVersion.V7_8);
}
@Test
@@ -81,6 +84,7 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V7_5.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V7_6.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V7_7.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V7_8.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
}
@Test
@@ -96,6 +100,7 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V7_5.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_6.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_7.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_8.isV6OrLater()).isTrue();
}
@Test
@@ -111,5 +116,6 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V7_5.isV7OrLater()).isTrue();
assertThat(ElasticVersion.V7_6.isV7OrLater()).isTrue();
assertThat(ElasticVersion.V7_7.isV7OrLater()).isTrue();
assertThat(ElasticVersion.V7_8.isV7OrLater()).isTrue();
}
}

4
tools/nongoogle.bzl
View File

@@ -96,8 +96,8 @@ def declare_nongoogle_deps():
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.7.1",
sha1 = "6d44a8e35c11df6883747200bcf46f476a1782b8",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.8.0",
sha1 = "ab28f6110bdc7d2ec886e1d6ff29a6c8ee30b883",
)
maven_jar(