opendev/gerrit
Code Issues Proposed changes

Elasticsearch: Remove support for EOL 6.x versions

Browse Source 
Remove support for Elasticsearch versions 6.[2-4], as they became EOL
recently [1]. Versions 6.{0,1} were never added in for Gerrit support.

[1] https://www.elastic.co/support/eol

Feature: Issue 12527
Change-Id: Ib0971eb98df4586920d364170d17591dd19aeed3
This commit is contained in:
Marco Miller
2020-04-08 10:03:27 -04:00
parent 2c1340ff19
commit 4a6b0593ef
3 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,9 +18,6 @@ import com.google.common.base.Joiner;
import java.util.regex.Pattern;
public enum ElasticVersion {
V6_2("6.2.*"),
V6_3("6.3.*"),
V6_4("6.4.*"),
V6_5("6.5.*"),
V6_6("6.6.*"),
V6_7("6.7.*"),

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

@@ -38,12 +38,6 @@ public class ElasticContainer extends ElasticsearchContainer {
private static String getImageName(ElasticVersion version) {
switch (version) {
case V6_2:
return "blacktop/elasticsearch:6.2.4";
case V6_3:
return "blacktop/elasticsearch:6.3.2";
case V6_4:
return "blacktop/elasticsearch:6.4.3";
case V6_5:
return "blacktop/elasticsearch:6.5.4";
case V6_6:

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

@@ -25,15 +25,6 @@ public class ElasticVersionTest {
@Test
public void supportedVersion() throws Exception {
assertThat(ElasticVersion.forVersion("6.2.0")).isEqualTo(ElasticVersion.V6_2);
assertThat(ElasticVersion.forVersion("6.2.4")).isEqualTo(ElasticVersion.V6_2);
assertThat(ElasticVersion.forVersion("6.3.0")).isEqualTo(ElasticVersion.V6_3);
assertThat(ElasticVersion.forVersion("6.3.2")).isEqualTo(ElasticVersion.V6_3);
assertThat(ElasticVersion.forVersion("6.4.0")).isEqualTo(ElasticVersion.V6_4);
assertThat(ElasticVersion.forVersion("6.4.1")).isEqualTo(ElasticVersion.V6_4);
assertThat(ElasticVersion.forVersion("6.5.0")).isEqualTo(ElasticVersion.V6_5);
assertThat(ElasticVersion.forVersion("6.5.1")).isEqualTo(ElasticVersion.V6_5);
@@ -78,9 +69,6 @@ public class ElasticVersionTest {
@Test
public void atLeastMinorVersion() throws Exception {
assertThat(ElasticVersion.V6_2.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V6_3.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V6_4.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V6_5.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V6_6.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V6_7.isAtLeastMinorVersion(ElasticVersion.V6_7)).isTrue();
@@ -96,9 +84,6 @@ public class ElasticVersionTest {
@Test
public void version6OrLater() throws Exception {
assertThat(ElasticVersion.V6_2.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_3.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_4.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_5.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_6.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_7.isV6OrLater()).isTrue();
@@ -114,9 +99,6 @@ public class ElasticVersionTest {
@Test
public void version7OrLater() throws Exception {
assertThat(ElasticVersion.V6_2.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_3.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_4.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_5.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_6.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_7.isV7OrLater()).isFalse();