chore: Update to ES 8 (#4406)

Co-authored-by: Houssain Barouni <houssain.barouni@camunda.com> Co-authored-by: Houssain Barouni <146710021+houssain-barouni@users.noreply.github.com>
camunda · Feb 7, 2024 · 31bcecb · 31bcecb
1 parent 0fda051
commit 31bcecb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 107 deletions.
diff --git a/.ci/podSpecs/builderAgent.yml b/.ci/podSpecs/builderAgent.yml
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.10
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.9.2
         env:
           discovery.type: single-node
           cluster.name: docker-cluster

diff --git a/data-generator/src/main/java/io/camunda/tasklist/data/es/DevDataGeneratorElasticSearch.java b/data-generator/src/main/java/io/camunda/tasklist/data/es/DevDataGeneratorElasticSearch.java
@@ -29,7 +29,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-@Profile({"dev-data", "e2e-test"})
+@Profile("dev-data")
 @Conditional(ElasticSearchCondition.class)
 public class DevDataGeneratorElasticSearch extends DevDataGeneratorAbstract
     implements DataGenerator {

diff --git a/data-generator/src/main/java/io/camunda/tasklist/data/os/DevDataGeneratorOpenSearch.java b/data-generator/src/main/java/io/camunda/tasklist/data/os/DevDataGeneratorOpenSearch.java
@@ -25,7 +25,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-@Profile({"dev-data", "e2e-test"})
+@Profile("dev-data")
 @Conditional(OpenSearchCondition.class)
 public class DevDataGeneratorOpenSearch extends DevDataGeneratorAbstract implements DataGenerator {
 

diff --git a/...gration-tests/src/test/java/io/camunda/tasklist/es/ElasticsearchConnectorBasicAuthIT.java b/...gration-tests/src/test/java/io/camunda/tasklist/es/ElasticsearchConnectorBasicAuthIT.java
@@ -52,7 +52,7 @@
 public class ElasticsearchConnectorBasicAuthIT extends TasklistIntegrationTest {
 
   static ElasticsearchContainer elasticsearch =
-      new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.16.3")
+      new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.9.2")
           .withEnv(
               Map.of(
                   "xpack.security.enabled", "true",

diff --git a/...tegration-tests/src/test/java/io/camunda/tasklist/es/ElasticsearchConnectorSSLAuthIT.java b/...tegration-tests/src/test/java/io/camunda/tasklist/es/ElasticsearchConnectorSSLAuthIT.java
@@ -45,7 +45,7 @@ public class ElasticsearchConnectorSSLAuthIT extends TasklistIntegrationTest {
   static String certDir = new File("src/test/resources/certs").getAbsolutePath();
 
   static ElasticsearchContainer elasticsearch =
-      new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.16.2")
+      new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.9.2")
           .withCopyFileToContainer(
               MountableFile.forHostPath("src/test/resources/certs/elastic-stack-ca.p12"),
               "/usr/share/elasticsearch/config/certs/elastic-stack-ca.p12")