diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml index 55a296e9fdb..9c26abb3b08 100644 --- a/filebeat/Jenkinsfile.yml +++ b/filebeat/Jenkinsfile.yml @@ -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 diff --git a/testing/environments/7.11.yml b/testing/environments/prev-minor.yml similarity index 78% rename from testing/environments/7.11.yml rename to testing/environments/prev-minor.yml index 7f93445987c..a4506188f6b 100644 --- a/testing/environments/7.11.yml +++ b/testing/environments/prev-minor.yml @@ -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 @@ -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 @@ -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 diff --git a/testing/environments/snapshot-oss.yml b/testing/environments/snapshot-oss.yml index 759dd22753e..d3a731eb1d8 100644 --- a/testing/environments/snapshot-oss.yml +++ b/testing/environments/snapshot-oss.yml @@ -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 diff --git a/x-pack/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml index 09c837bccf6..0e32ddefc47 100644 --- a/x-pack/filebeat/Jenkinsfile.yml +++ b/x-pack/filebeat/Jenkinsfile.yml @@ -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