[Release] Update test environment to 8.10.0 (#35872)

* [Release] update test environment * Update docker-compose.yml * Update docker-compose.yml * Update latest.yml * Update docker-compose.yml --------- Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co> (cherry picked from commit 90f6a25) # Conflicts: # testing/environments/latest.yml # x-pack/metricbeat/docker-compose.yml
elastic · Jun 22, 2023 · 52d8f3e · 52d8f3e
1 parent 1245830
commit 52d8f3e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
@@ -17,11 +17,11 @@ services:
 
   # Used by base tests
   elasticsearch:
-    image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.7.0}-1
+    image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.8.1}-1
     build:
       context: ./module/elasticsearch/_meta
       args:
-        ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.7.0}
+        ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.8.1}
     environment:
       - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
       - "transport.host=127.0.0.1"
@@ -38,11 +38,11 @@ services:
 
   # Used by base tests
   kibana:
-    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.7.0}-1
+    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.8.1}-1
     build:
       context: ./module/kibana/_meta
       args:
-        KIBANA_VERSION: ${KIBANA_VERSION:-8.7.0}
+        KIBANA_VERSION: ${KIBANA_VERSION:-8.8.1}
     healthcheck:
       test: ["CMD-SHELL", "curl -u beats:testing -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
       retries: 600
@@ -53,11 +53,11 @@ services:
 
   # Used by base tests
   metricbeat:
-    image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.7.0}-1
+    image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.8.1}-1
     build:
       context: ./module/beat/_meta
       args:
-        BEAT_VERSION: ${BEAT_VERSION:-8.7.0}
+        BEAT_VERSION: ${BEAT_VERSION:-8.8.1}
     command: '-e'
     ports:
       - 5066:5066
diff --git a/testing/environments/latest.yml b/testing/environments/latest.yml
@@ -3,7 +3,11 @@
 version: '2.3'
 services:
   elasticsearch:
+<<<<<<< HEAD
     image: docker.elastic.co/elasticsearch/elasticsearch:8.8.2
+=======
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.8.1
+>>>>>>> 90f6a25990 ([Release] Update test environment to 8.10.0 (#35872))
     healthcheck:
       test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
       retries: 300
@@ -19,7 +23,11 @@ services:
       - "script.context.template.cache_max_size=2000"
 
   logstash:
+<<<<<<< HEAD
     image: docker.elastic.co/logstash/logstash:8.8.2
+=======
+    image: docker.elastic.co/logstash/logstash:8.8.1
+>>>>>>> 90f6a25990 ([Release] Update test environment to 8.10.0 (#35872))
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
       retries: 300
@@ -29,7 +37,11 @@ services:
       - ./docker/logstash/pki:/etc/pki:ro
 
   kibana:
+<<<<<<< HEAD
     image: docker.elastic.co/kibana/kibana:8.8.2
+=======
+    image: docker.elastic.co/kibana/kibana:8.8.1
+>>>>>>> 90f6a25990 ([Release] Update test environment to 8.10.0 (#35872))
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5601"]
       retries: 300

diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml
@@ -24,11 +24,19 @@ services:
   kibana:
     # Copied configuration from OSS metricbeat because services with depends_on
     # cannot be extended with extends
+<<<<<<< HEAD
     image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.8.2}-1
     build:
       context: ../../metricbeat/module/kibana/_meta
       args:
         KIBANA_VERSION: ${KIBANA_VERSION:-8.8.2}
+=======
+    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.8.1}-1
+    build:
+      context: ../../metricbeat/module/kibana/_meta
+      args:
+        KIBANA_VERSION: ${KIBANA_VERSION:-8.8.1}
+>>>>>>> 90f6a25990 ([Release] Update test environment to 8.10.0 (#35872))
     depends_on:
       - elasticsearch
     ports: