From f386aa3de2469b476fa69a37167b4494dacb27c7 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Tue, 11 Feb 2020 16:33:09 -0500 Subject: [PATCH] Add support for Elasticsearch version 7.6.* - Upgrade elasticsearch-rest-client to 7.6.0. - Add V7_6 to the version manager, and use this in all the V7 tests. - Use the 7.6.0 image from blacktop in the test container; based on [1]. - Triggered by watching releases [2], which links to the release notes. [1] https://github.com/blacktop/docker-elasticsearch-alpine/pull/27 [2] https://github.com/elastic/elasticsearch/releases/tag/v7.6.0 Change-Id: I63e6c396b8c159b4ebdfe9817518f239fd62928c --- java/com/google/gerrit/elasticsearch/ElasticVersion.java | 3 ++- .../com/google/gerrit/acceptance/pgm/ElasticReindexIT.java | 2 +- .../com/google/gerrit/acceptance/ssh/ElasticIndexIT.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 ++ .../gerrit/elasticsearch/ElasticV7QueryAccountsTest.java | 2 +- .../gerrit/elasticsearch/ElasticV7QueryChangesTest.java | 2 +- .../gerrit/elasticsearch/ElasticV7QueryGroupsTest.java | 2 +- .../gerrit/elasticsearch/ElasticV7QueryProjectsTest.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticVersionTest.java | 6 ++++++ tools/nongoogle.bzl | 4 ++-- 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java index 574a22623a..6f4ade2dd6 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -31,7 +31,8 @@ public enum ElasticVersion { V7_2("7.2.*"), V7_3("7.3.*"), V7_4("7.4.*"), - V7_5("7.5.*"); + V7_5("7.5.*"), + V7_6("7.6.*"); 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 a5ac3a9163..181f6f064a 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/javatests/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_5); + return getConfig(ElasticVersion.V7_6); } @Override diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 5348c53266..0d55d7a718 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/javatests/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_5); + return getConfig(ElasticVersion.V7_6); } @Override diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index 53acdeb020..77c50efde5 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -64,6 +64,8 @@ public class ElasticContainer extends ElasticsearchContainer { return "blacktop/elasticsearch:7.4.2"; case V7_5: return "blacktop/elasticsearch:7.5.2"; + case V7_6: + return "blacktop/elasticsearch:7.6.0"; } 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 5e533fb1b8..826473f2c0 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_5); + container = ElasticContainer.createAndStart(ElasticVersion.V7_6); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 3c70ed5179..43a2dfc46e 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -47,7 +47,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_5); + container = ElasticContainer.createAndStart(ElasticVersion.V7_6); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); client = HttpAsyncClients.createDefault(); client.start(); diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index f2dcdaa335..0954e603c2 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_5); + container = ElasticContainer.createAndStart(ElasticVersion.V7_6); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index e2de7fe040..e6d78770dd 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_5); + container = ElasticContainer.createAndStart(ElasticVersion.V7_6); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java index b5c455d56e..9786e373c0 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -66,6 +66,9 @@ public class ElasticVersionTest { assertThat(ElasticVersion.forVersion("7.5.0")).isEqualTo(ElasticVersion.V7_5); assertThat(ElasticVersion.forVersion("7.5.1")).isEqualTo(ElasticVersion.V7_5); + + assertThat(ElasticVersion.forVersion("7.6.0")).isEqualTo(ElasticVersion.V7_6); + assertThat(ElasticVersion.forVersion("7.6.1")).isEqualTo(ElasticVersion.V7_6); } @Test @@ -92,6 +95,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_3.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_4.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_5.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); + assertThat(ElasticVersion.V7_6.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); } @Test @@ -110,6 +114,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_3.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_4.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_5.isV6OrLater()).isTrue(); + assertThat(ElasticVersion.V7_6.isV6OrLater()).isTrue(); } @Test @@ -128,5 +133,6 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_3.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_4.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_5.isV7OrLater()).isTrue(); + assertThat(ElasticVersion.V7_6.isV7OrLater()).isTrue(); } } diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 63e13192a8..7819502d5e 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -94,8 +94,8 @@ def declare_nongoogle_deps(): # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.5.2", - sha1 = "e11393f600a425b7f62e6f653e19a9e53556fd79", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.6.0", + sha1 = "3d56c1fca22af1aab5a1b23698ae9ec6f71db1a2", ) maven_jar(