Skip to content

Commit

Permalink
[8.1](backport #30599) bump test environments versions (#30605)
Browse files Browse the repository at this point in the history
* bump test environments versions (#30599)

(cherry picked from commit 8e288ea)

# Conflicts:
#	testing/environments/latest.yml

* fix conflicts

Co-authored-by: Kevin Lacabane <kevin.lacabane@elastic.co>
  • Loading branch information
mergify[bot] and klacabane authored Mar 7, 2022
1 parent d2ca3b9 commit 2b1d68a
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:-7.14.0}-1
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.0.0}-1
build:
context: ./module/elasticsearch/_meta
args:
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.14.0}
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.0.0}
environment:
- "ES_JAVA_OPTS=-Xms256m -Xmx256m"
- "network.host="
Expand All @@ -39,23 +39,23 @@ services:

# Used by base tests
kibana:
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.14.0}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.0.0}-1
build:
context: ./module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
KIBANA_VERSION: ${KIBANA_VERSION:-8.0.0}
depends_on:
- elasticsearch
ports:
- 5601

# Used by base tests
metricbeat:
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.12.0}-1
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.0.0}-1
build:
context: ./module/beat/_meta
args:
BEAT_VERSION: ${BEAT_VERSION:-7.12.0}
BEAT_VERSION: ${BEAT_VERSION:-8.0.0}
command: '-e'
ports:
- 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:7.17.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
retries: 300
Expand All @@ -20,7 +20,7 @@ services:
- "script.context.template.cache_max_size=2000"

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

kibana:
image: docker.elastic.co/kibana/kibana:7.17.0
image: docker.elastic.co/kibana/kibana:8.0.0
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:-7.14.0}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.0.0}-1
build:
context: ../../metricbeat/module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
KIBANA_VERSION: ${KIBANA_VERSION:-8.0.0}
depends_on:
- elasticsearch
ports:
Expand Down

0 comments on commit 2b1d68a

Please sign in to comment.