From 23efffb9d12b03dd1642d16098e45e439e937b5d Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Tue, 1 Oct 2019 16:55:04 -0400 Subject: [PATCH 1/2] Add support for Elasticsearch version 7.4.* Upgrade elasticsearch-rest-client to 7.4.0. Add V7_4 to the version manager, and use this in all the V7 tests. Use the 7.4.0 image from blacktop in the test container. Change-Id: Ib993f078c142afe34d6f6be83f745464c16b0d2e --- WORKSPACE | 4 ++-- .../com/google/gerrit/acceptance/pgm/ElasticReindexIT.java | 2 +- .../com/google/gerrit/acceptance/ssh/ElasticIndexIT.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticVersion.java | 3 ++- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 ++ .../gerrit/elasticsearch/ElasticV7QueryAccountsTest.java | 2 +- .../gerrit/elasticsearch/ElasticV7QueryChangesTest.java | 2 +- .../gerrit/elasticsearch/ElasticV7QueryGroupsTest.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticVersionTest.java | 6 ++++++ 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8856078b1f..77921d9e4e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -916,8 +916,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.3.2", - sha1 = "38721e908cad8a30fa3f8e659c0571150a60cab3", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.0", + sha1 = "481fedd31088ec6ba79a2aeffec3eccae4c0772b", ) maven_jar( diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index 0da3198d3a..afb8182be5 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -37,7 +37,7 @@ public class ElasticReindexIT extends AbstractReindexTests { @ConfigSuite.Config public static Config elasticsearchV7() { - return getConfig(ElasticVersion.V7_3); + return getConfig(ElasticVersion.V7_4); } @Override diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 839564fb62..0716d03c23 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java @@ -36,7 +36,7 @@ public class ElasticIndexIT extends AbstractIndexTests { @ConfigSuite.Config public static Config elasticsearchV7() { - return getConfig(ElasticVersion.V7_3); + return getConfig(ElasticVersion.V7_4); } @Override diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java index baf3e38cfa..309ee3e5b9 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -29,7 +29,8 @@ public enum ElasticVersion { V7_0("7.0.*"), V7_1("7.1.*"), V7_2("7.2.*"), - V7_3("7.3.*"); + V7_3("7.3.*"), + V7_4("7.4.*"); private final String version; private final Pattern pattern; diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java index 265c61ccf3..c3ab63f2a8 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -60,6 +60,8 @@ public class ElasticContainer extends ElasticsearchContainer { return "blacktop/elasticsearch:7.2.1"; case V7_3: return "blacktop/elasticsearch:7.3.2"; + case V7_4: + return "blacktop/elasticsearch:7.4.0"; } throw new IllegalStateException("No tests for version: " + version.name()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java index 4a5210789d..645534d750 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java @@ -34,7 +34,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_3); + container = ElasticContainer.createAndStart(ElasticVersion.V7_4); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 2301082121..c3432d36fd 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_3); + container = ElasticContainer.createAndStart(ElasticVersion.V7_4); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); client = HttpAsyncClients.createDefault(); client.start(); diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index 82f9abe6ea..5c5b9f9a7e 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java @@ -34,7 +34,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_3); + container = ElasticContainer.createAndStart(ElasticVersion.V7_4); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java index 707405b31c..8198cedbc7 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -60,6 +60,9 @@ public class ElasticVersionTest { assertThat(ElasticVersion.forVersion("7.3.0")).isEqualTo(ElasticVersion.V7_3); assertThat(ElasticVersion.forVersion("7.3.1")).isEqualTo(ElasticVersion.V7_3); + + assertThat(ElasticVersion.forVersion("7.4.0")).isEqualTo(ElasticVersion.V7_4); + assertThat(ElasticVersion.forVersion("7.4.1")).isEqualTo(ElasticVersion.V7_4); } @Test @@ -84,6 +87,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_1.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_2.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_3.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); + assertThat(ElasticVersion.V7_4.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); } @Test @@ -100,6 +104,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_1.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_2.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_3.isV6OrLater()).isTrue(); + assertThat(ElasticVersion.V7_4.isV6OrLater()).isTrue(); } @Test @@ -116,5 +121,6 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_1.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_2.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_3.isV7OrLater()).isTrue(); + assertThat(ElasticVersion.V7_4.isV7OrLater()).isTrue(); } } From dafca93528797bf64bc929badb8d0e5e9aa2fd95 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 8 Oct 2019 09:28:21 +0900 Subject: [PATCH 2/2] ElasticV7QueryProjectsTest: Use V7_4 Change-Id: I224b5a8a3f4ecedb8c99b1d38f0c1c6a7efea8f0 --- .../google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index 6cc12f1ae8..cf93f6fd6c 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_3); + container = ElasticContainer.createAndStart(ElasticVersion.V7_4); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); }