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

Filebeat: Change compatibility test stage to test against previous minor instead of 7.11 #28274

Merged
merged 3 commits into from
Oct 7, 2021
+12 −12
Merged

Filebeat: Change compatibility test stage to test against previous minor instead of 7.11 #28274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f93c36
Change 7.11-compat test to prev-minor test
adriansr Oct 6, 2021
8b8e35b
Fix
adriansr Oct 6, 2021
f0e3d5b
Fix Kibana health check in testing environment
adriansr Oct 6, 2021
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
6 changes: 3 additions & 3 deletions filebeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ stages:
pythonIntegTest:
mage: "mage pythonIntegTest" ## run the ITs only if the changeset affects a specific module.
stage: mandatory
module-compat-7.11:
mage: >- ## Run module integration tests under ES 7.11 to ensure ingest pipeline compatibility.
STACK_ENVIRONMENT=7.11
module-compat-prev-minor:
mage: >- ## Run module integration tests under previous minor of ES to ensure ingest pipeline compatibility.
STACK_ENVIRONMENT=prev-minor
TESTING_FILEBEAT_SKIP_DIFF=1
PYTEST_ADDOPTS='-k test_modules'
mage pythonIntegTest
Expand Down
10 changes: 5 additions & 5 deletions testing/environments/7.11.yml → testing/environments/prev-minor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This is the latest 7.11
# This is the previous minor for compatibility tests.

version: '2.3'
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.11.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.15.0
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:7.11.2
image: docker.elastic.co/logstash/logstash:7.15.0
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
retries: 600
Expand All @@ -31,8 +31,8 @@ services:
- ./docker/logstash/pki:/etc/pki:ro

kibana:
image: docker.elastic.co/kibana/kibana:7.11.2
image: docker.elastic.co/kibana/kibana:7.15.0
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status | grep -q 'Looking good'"]
test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
retries: 600
interval: 1s
2 changes: 1 addition & 1 deletion testing/environments/snapshot-oss.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
kibana:
image: docker.elastic.co/kibana/kibana:8.0.0-7e122dd9-SNAPSHOT
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status | grep -q 'Looking good'"]
test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
retries: 600
interval: 1s

Expand Down
6 changes: 3 additions & 3 deletions x-pack/filebeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ stages:
pythonIntegTest:
mage: "mage pythonIntegTest" ## run the ITs only if the changeset affects a specific module.
stage: mandatory
module-compat-7.11:
mage: >- ## Run module integration tests under ES 7.11 to ensure ingest pipeline compatibility.
STACK_ENVIRONMENT=7.11
module-compat-prev-minor:
mage: >- ## Run module integration tests under previous minor of ES to ensure ingest pipeline compatibility.
STACK_ENVIRONMENT=prev-minor
TESTING_FILEBEAT_SKIP_DIFF=1
PYTEST_ADDOPTS='-k test_xpack_modules'
mage pythonIntegTest
Expand Down