Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release] Update test environments for 8.1.2 #30855

Merged
merged 4 commits into from
Mar 23, 2022
Merged

[Release] Update test environments for 8.1.2 #30855

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a07af2
[Release] update test environment
elasticmachine Mar 16, 2022
cbd410d
cleanup rc1 postfix as not needed anymore.
ruflin Mar 18, 2022
5520d9e
Merge branch '8.1' into update_testing_env_next_8.1.2
ruflin Mar 18, 2022
afee31a
fix metricbeat conflict file
ruflin Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions metricbeat/docker-compose.yml
View file
Open in desktop
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.0.0}-1
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.1.1}-1
build:
context: ./module/elasticsearch/_meta
args:
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.0.0}
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.1.1}
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:-8.0.0}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.1.1}-1
build:
context: ./module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-8.0.0}
KIBANA_VERSION: ${KIBANA_VERSION:-8.1.1}
depends_on:
- elasticsearch
ports:
- 5601

# Used by base tests
metricbeat:
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.0.0}-1
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.1.1}-1
build:
context: ./module/beat/_meta
args:
BEAT_VERSION: ${BEAT_VERSION:-8.0.0}
BEAT_VERSION: ${BEAT_VERSION:-8.1.1}
command: '-e'
ports:
- 5066
6 changes: 3 additions & 3 deletions testing/environments/latest.yml
View file
Open in desktop
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.0.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.1.1
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:8.0.0
image: docker.elastic.co/logstash/logstash:8.1.1
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:8.0.0
image: docker.elastic.co/kibana/kibana:8.1.1
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5601"]
retries: 300
Expand Down
6 changes: 3 additions & 3 deletions testing/environments/prev-minor.yml
View file
Open in desktop
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.0.0-rc1
image: docker.elastic.co/elasticsearch/elasticsearch:8.1.0-rc1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@klacabane @matschaffer This looks off. Likely it should be 8.0.1 or similar? Same below.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems a little weird, yeah. Not sure what opens these PRs. Guessing something @elastic/observablt-robots manages?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't manage this, the scripts are stored in ingest-dev, the snippet for the specific makefile goal in charge of this, can be seen below:

PATCHNUM ?= $(shell echo $(CURRENT_RELEASE) | cut -f3 -d.)
LATEST_RELEASE ?= $(MAJOR).$(MINOR).$(shell expr $(PATCHNUM) - 1)

## @help:update-previous-minor-filebeat:Update the references on with the previous minor release for the filebeat previous minor testing stage
.PHONY: update-previous-minor-filebeat
update-previous-minor-filebeat:
ifeq ($(MAJOR),6)
	echo '6.<minor> branch does not need to add any backport policy.'
else
	cd beats; \
		$(SED) -E -e "s#(image: docker\.elastic\.co/.*):[0-9]+\.[0-9]+\.[0-9]+#\1:$(LATEST_RELEASE)#g" testing/environments/prev-minor.yml
endif

and CURRENT_RELEASE=8.1.1 as stated in the branch automation

On the other hand, this particular automation was requested by @adriansr in #28274 in case it's required further details.

In a nutshell, I think rc1 was added back in the days in #30027, I don't know what's the version that should be added in this particular case :/

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems the script is fine it is just not able to deal with -rc1 etc. As having rc1 etc. is kind of unique and an edge case, I suggest we clean it up manually.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matschaffer For the ping, I assumed this is because of stack monitoring that we test prev minor but it seems more generic, so we need to handle this from the Agent team.

healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
retries: 300
Expand All @@ -21,7 +21,7 @@ services:
- "action.destructive_requires_name=false"

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

kibana:
image: docker.elastic.co/kibana/kibana:8.0.0-rc1
image: docker.elastic.co/kibana/kibana:8.1.0-rc1
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
retries: 600
Expand Down
4 changes: 2 additions & 2 deletions x-pack/metricbeat/docker-compose.yml
View file
Open in desktop
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.0.0}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.1.1}-1
build:
context: ../../metricbeat/module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-8.0.0}
KIBANA_VERSION: ${KIBANA_VERSION:-8.1.1}
depends_on:
- elasticsearch
ports:
Expand Down