From df16e3f0ff562c0038b4f9df02571f9e24bce230 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Tue, 25 Aug 2020 15:42:35 -0400 Subject: Add support for Elasticsearch version 7.9.* Upgrade elasticsearch-rest-client to 7.9.3, which is the currently latest 7.9 minor version available. Add V7_9 to the version manager and use it for all the V7 tests. Change-Id: I7d76ece60d3ed7400bcf28bcd45d0e2e02870ccd --- java/com/google/gerrit/elasticsearch/ElasticVersion.java | 3 ++- javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java | 2 +- javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java | 2 +- javatests/com/google/gerrit/elasticsearch/ElasticContainer.java | 2 ++ .../com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java | 2 +- javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java | 3 +++ tools/nongoogle.bzl | 4 ++-- 10 files changed, 15 insertions(+), 9 deletions(-) diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java index bba1577147..ba5f1fed63 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -24,7 +24,8 @@ public enum ElasticVersion { V7_5("7.5.*"), V7_6("7.6.*"), V7_7("7.7.*"), - V7_8("7.8.*"); + V7_8("7.8.*"), + V7_9("7.9.*"); private final String version; private final Pattern pattern; diff --git a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index f23cc10cb8..98f4f859da 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -26,7 +26,7 @@ public class ElasticReindexIT extends AbstractReindexTests { @ConfigSuite.Default public static Config elasticsearchV7() { - return getConfig(ElasticVersion.V7_8); + return getConfig(ElasticVersion.V7_9); } @Override diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index f35bcb79eb..313160df18 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java @@ -28,7 +28,7 @@ public class ElasticIndexIT extends AbstractIndexTests { @ConfigSuite.Default public static Config elasticsearchV7() { - return getConfig(ElasticVersion.V7_8); + return getConfig(ElasticVersion.V7_9); } @Override diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index e8cf3e90ea..b0da80d388 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -53,6 +53,8 @@ public class ElasticContainer extends ElasticsearchContainer { return "blacktop/elasticsearch:7.7.1"; case V7_8: return "blacktop/elasticsearch:7.8.1"; + case V7_9: + return "blacktop/elasticsearch:7.9.3"; } throw new IllegalStateException("No tests for version: " + version.name()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java index 48264906d4..89391c5582 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java @@ -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_8); + container = ElasticContainer.createAndStart(ElasticVersion.V7_9); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index d9a4d2ebc2..01bc902a0c 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -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_8); + container = ElasticContainer.createAndStart(ElasticVersion.V7_9); client = HttpAsyncClients.createDefault(); client.start(); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index 0fc96f8388..472ac89da6 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java @@ -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_8); + container = ElasticContainer.createAndStart(ElasticVersion.V7_9); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index 1e56af9556..d2149e979e 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java @@ -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_8); + container = ElasticContainer.createAndStart(ElasticVersion.V7_9); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java index 1ec8a5dadd..0ca57a5961 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -42,6 +42,9 @@ public class ElasticVersionTest { assertThat(ElasticVersion.forVersion("7.8.0")).isEqualTo(ElasticVersion.V7_8); assertThat(ElasticVersion.forVersion("7.8.1")).isEqualTo(ElasticVersion.V7_8); + + assertThat(ElasticVersion.forVersion("7.9.0")).isEqualTo(ElasticVersion.V7_9); + assertThat(ElasticVersion.forVersion("7.9.1")).isEqualTo(ElasticVersion.V7_9); } @Test diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 5165e09483..6c1a853510 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -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.8.1", - sha1 = "59feefe006a96a39f83b0dfb6780847e06c1d0a8", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.9.3", + sha1 = "0b621621ecc6a8d9b536334d5f3301940302efd2", ) maven_jar( -- cgit v1.2.3