opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Upgrade testcontainers to 1.15.0

Change-Id: Ic79bbbf04fb90f1655ad0917265f49b1372befd5
This commit is contained in:
Marco Miller
2020-11-17 15:14:54 -05:00
parent 04decf91a3 0471d0cad4
commit 5a3e6fd0b7
6 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import org.junit.AssumptionViolatedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
import org.testcontainers.utility.DockerImageName;
/* Helper class for running ES integration tests in docker container */
public class ElasticContainer extends ElasticsearchContainer {
@@ -63,7 +64,9 @@ public class ElasticContainer extends ElasticsearchContainer {
}
private ElasticContainer(ElasticVersion version) {
super(getImageName(version));
super(
DockerImageName.parse(getImageName(version))
.asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch"));
}
@Override