Skip to content

Commit

Permalink
[8.9](backport #35872) [Release] Update test environment to 8.10.0 (#…
Browse files Browse the repository at this point in the history
…35883)

* [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

* Resolve conflict in latest.yml

* Resolve conflict in docker-compose.yml

---------

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
  • Loading branch information
3 people committed Jun 22, 2023
1 parent 1245830 commit 6b3f4ce
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions testing/environments/latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: '2.3'
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.8.2
image: docker.elastic.co/elasticsearch/elasticsearch:8.8.1
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
retries: 300
Expand All @@ -19,7 +19,7 @@ services:
- "script.context.template.cache_max_size=2000"

logstash:
image: docker.elastic.co/logstash/logstash:8.8.2
image: docker.elastic.co/logstash/logstash:8.8.1
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
retries: 300
Expand All @@ -29,7 +29,7 @@ services:
- ./docker/logstash/pki:/etc/pki:ro

kibana:
image: docker.elastic.co/kibana/kibana:8.8.2
image: docker.elastic.co/kibana/kibana:8.8.1
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5601"]
retries: 300
Expand Down
4 changes: 2 additions & 2 deletions x-pack/metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ services:
kibana:
# Copied configuration from OSS metricbeat because services with depends_on
# cannot be extended with extends
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.8.2}-1
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.2}
KIBANA_VERSION: ${KIBANA_VERSION:-8.8.1}
depends_on:
- elasticsearch
ports:
Expand Down

0 comments on commit 6b3f4ce

Please sign in to comment.