From 7d433c504dc6d7e498e50d93ed1b5686f3e0e951 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 1 Nov 2019 14:22:07 +0900 Subject: [PATCH 1/2] ElasticContainer: Use 6.8.4 image for V6_8 tests 6.8.4 is the latest release on the 6.8 series. Change-Id: I04b76e76b4841904f1db16773b5ea6a9793b48ac --- .../java/com/google/gerrit/elasticsearch/ElasticContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 67113888d0..4e7256db91 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 @@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V6_7: return "blacktop/elasticsearch:6.7.2"; case V6_8: - return "blacktop/elasticsearch:6.8.2"; + return "blacktop/elasticsearch:6.8.4"; case V7_0: return "blacktop/elasticsearch:7.0.1"; case V7_1: From e212914cd5ad4fc49e96f6005eab9792e0bd23cb Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 1 Nov 2019 14:17:10 +0900 Subject: [PATCH 2/2] Update elasticsearch-rest-client to 7.4.2 Also use this version for the test image. Change-Id: Id9fed03f8251861017f26791d5c59e0b7fa6af5a --- WORKSPACE | 4 ++-- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 800276edb8..5741e8e8f6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -918,8 +918,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.1", - sha1 = "b4e00ab47019103d69b6c9dcfdcbd3bfda00f86e", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.2", + sha1 = "f48725523c0b3402f869214433602f8d3f4c737c", ) maven_jar( 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 4e7256db91..b0d3b57b2f 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 @@ -61,7 +61,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V7_3: return "blacktop/elasticsearch:7.3.2"; case V7_4: - return "blacktop/elasticsearch:7.4.1"; + return "blacktop/elasticsearch:7.4.2"; } throw new IllegalStateException("No tests for version: " + version.name()); }