From 8b8e35b961f1601e71b0a20ad08b8e291b3db50d Mon Sep 17 00:00:00 2001 From: Adrian Serrano Date: Wed, 6 Oct 2021 15:28:02 +0200 Subject: [PATCH] Fix --- testing/environments/prev-minor.yml | 6 +++--- x-pack/filebeat/Jenkinsfile.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/environments/prev-minor.yml b/testing/environments/prev-minor.yml index 917203c126b..5ea3311a58e 100644 --- a/testing/environments/prev-minor.yml +++ b/testing/environments/prev-minor.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.15 + 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.15 + image: docker.elastic.co/logstash/logstash:7.15.0 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 600 @@ -31,7 +31,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana:7.15 + image: docker.elastic.co/kibana/kibana:7.15.0 healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status | grep -q 'Looking good'"] retries: 600 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