Use official elasticsearch docker image for tests
This is a switch from elasticsearch-oss image to the full image.
ElasticSearch's point in time feature will be introduced in a
follow-up change (I8baa6e07) and is not available in the oss
image used in blacktop/elasticsearch* images. Hence the need
for switch. Although the tests are only run against the latest
version (7.10), we switch the older versions as well to the
full image to be consistent. When running tests with the full
image we will likely run into OOM issues on the docker hosts.
To help mitigate that, run the tests sequentially.
Change-Id: I951ce5e630a528f87ff3946647d96fe136702043
diff --git a/BUILD b/BUILD
index 4750354..b16fb0d 100644
--- a/BUILD
+++ b/BUILD
@@ -73,6 +73,7 @@
tags = [
"docker",
"elastic",
+ "exclusive",
],
deps = ELASTICSEARCH_DEPS + PLUGIN_TEST_DEPS + [
QUERY_TESTS_DEP % name,
diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
index b99deb0..e459902 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -33,21 +33,19 @@
private static String getImageName(ElasticVersion version) {
switch (version) {
case V7_6:
- return "blacktop/elasticsearch:7.6.2";
+ return "docker.elastic.co/elasticsearch/elasticsearch:7.6.2";
case V7_7:
- return "blacktop/elasticsearch:7.7.1";
+ return "docker.elastic.co/elasticsearch/elasticsearch:7.7.1";
case V7_8:
- return "blacktop/elasticsearch:7.8.1";
+ return "docker.elastic.co/elasticsearch/elasticsearch:7.8.1";
case V7_10:
- return "blacktop/elasticsearch:7.10.0";
+ return "docker.elastic.co/elasticsearch/elasticsearch:7.10.0";
}
throw new IllegalStateException("No tests for version: " + version.name());
}
private ElasticContainer(ElasticVersion version) {
- super(
- DockerImageName.parse(getImageName(version))
- .asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch"));
+ super(DockerImageName.parse(getImageName(version)));
}
@Override
