opendev/gerrit
Code Issues Proposed changes

Merge "Elasticsearch: Discontinue EOL versions 7.0 and 7.1 support" into stable-3.1

Browse Source
This commit is contained in:
Marco Miller
2020-12-10 16:58:13 +00:00
committed by Gerrit Code Review
parent 36cd47012e 52c143fabc
commit 9c7c609a5f
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/elasticsearch/ElasticVersion.java
View File

@@ -18,8 +18,6 @@ import com.google.common.base.Joiner;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public enum ElasticVersion { public enum ElasticVersion {
V7_0("7.0.*"),
V7_1("7.1.*"),
V7_2("7.2.*"), V7_2("7.2.*"),
V7_3("7.3.*"), V7_3("7.3.*"),
V7_4("7.4.*"), V7_4("7.4.*"),

4
javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -39,10 +39,6 @@ public class ElasticContainer extends ElasticsearchContainer {
private static String getImageName(ElasticVersion version) { private static String getImageName(ElasticVersion version) {
switch (version) { switch (version) {
case V7_0:
return "blacktop/elasticsearch:7.0.1";
case V7_1:
return "blacktop/elasticsearch:7.1.1";
case V7_2: case V7_2:
return "blacktop/elasticsearch:7.2.1"; return "blacktop/elasticsearch:7.2.1";
case V7_3: case V7_3:

6
javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
View File

@@ -22,12 +22,6 @@ import org.junit.Test;
public class ElasticVersionTest { public class ElasticVersionTest {
@Test @Test
public void supportedVersion() throws Exception { public void supportedVersion() throws Exception {
assertThat(ElasticVersion.forVersion("7.0.0")).isEqualTo(ElasticVersion.V7_0);
assertThat(ElasticVersion.forVersion("7.0.1")).isEqualTo(ElasticVersion.V7_0);
assertThat(ElasticVersion.forVersion("7.1.0")).isEqualTo(ElasticVersion.V7_1);
assertThat(ElasticVersion.forVersion("7.1.1")).isEqualTo(ElasticVersion.V7_1);
assertThat(ElasticVersion.forVersion("7.2.0")).isEqualTo(ElasticVersion.V7_2); assertThat(ElasticVersion.forVersion("7.2.0")).isEqualTo(ElasticVersion.V7_2);
assertThat(ElasticVersion.forVersion("7.2.1")).isEqualTo(ElasticVersion.V7_2); assertThat(ElasticVersion.forVersion("7.2.1")).isEqualTo(ElasticVersion.V7_2);