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.

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

[7.15](backport #28274) Filebeat: Change compatibility test stage to test against previous minor instead of 7.11 #28308

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,17 @@ stages:
pythonIntegTest:
mage: "mage pythonIntegTest" ## run the ITs only if the changeset affects a specific module.
stage: mandatory
<<<<<<< HEAD
=======
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
withModule: true
stage: mandatory
>>>>>>> 9806f9163d (Filebeat: Change compatibility test stage to test against previous minor instead of 7.11 (#28274))
macos:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
Expand Down
38 changes: 38 additions & 0 deletions testing/environments/prev-minor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This is the previous minor for compatibility tests.

version: '2.3'
services:
elasticsearch:
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
interval: 1s
environment:
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
- "network.host="
- "transport.host=127.0.0.1"
- "http.host=0.0.0.0"
- "xpack.security.enabled=false"
- "script.context.template.max_compilations_rate=unlimited"
- "script.context.ingest.cache_max_size=2000"
- "script.context.processor_conditional.cache_max_size=2000"
- "script.context.template.cache_max_size=2000"
- "action.destructive_requires_name=false"

logstash:
image: docker.elastic.co/logstash/logstash:7.15.0
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
retries: 600
interval: 1s
volumes:
- ./docker/logstash/pipeline:/usr/share/logstash/pipeline:ro
- ./docker/logstash/pki:/etc/pki:ro

kibana:
image: docker.elastic.co/kibana/kibana:7.15.0
healthcheck:
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
kibana:
image: docker.elastic.co/kibana/kibana-oss:7.15.1-3e6b9a63-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
11 changes: 11 additions & 0 deletions x-pack/filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,17 @@ stages:
pythonIntegTest:
mage: "mage pythonIntegTest" ## run the ITs only if the changeset affects a specific module.
stage: mandatory
<<<<<<< HEAD
=======
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
withModule: true
stage: mandatory
>>>>>>> 9806f9163d (Filebeat: Change compatibility test stage to test against previous minor instead of 7.11 (#28274))
macos:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
Expand Down