opendev/gerrit
Code Issues Proposed changes

Add support for Elasticsearch 6.4.0

Browse Source 
According to the release notes [1] there are several breaking changes,
but none of them seem to affect Gerrit's integration.

Update the version manager and adapter to recognize 6.4.* as a supported
version, and modify the test container to use 6.4.0 for the V6 tests.

Update the reindex and ssh index tests to also test against 6.4.0.

[1] https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-6.4.0.html

Bug: Issue 9670
Change-Id: If0d16df1a719d45aad9c56409e14c8fcf3945bd5
This commit is contained in:
David Pursehouse
2018-09-03 16:53:33 +09:00
parent f624784344
commit df5992e2ad
9 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_3);
container = ElasticContainer.createAndStart(ElasticVersion.V6_4);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

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

@@ -37,7 +37,7 @@ public class ElasticV6QueryChangesTest extends AbstractQueryChangesTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_3);
container = ElasticContainer.createAndStart(ElasticVersion.V6_4);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

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

@@ -36,7 +36,7 @@ public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_3);
container = ElasticContainer.createAndStart(ElasticVersion.V6_4);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

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

@@ -37,6 +37,9 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.forVersion("6.3.0")).isEqualTo(ElasticVersion.V6_3);
assertThat(ElasticVersion.forVersion("6.3.1")).isEqualTo(ElasticVersion.V6_3);
assertThat(ElasticVersion.forVersion("6.4.0")).isEqualTo(ElasticVersion.V6_4);
assertThat(ElasticVersion.forVersion("6.4.1")).isEqualTo(ElasticVersion.V6_4);
}
@Test