Filebeat: Change compatibility test stage to test against previous mi…

…nor instead of 7.11 (#28274) (#28307) This changes the compatibility test for Filebeat modules to test with the previous released minor. Relates #26629 (cherry picked from commit 9806f91) Co-authored-by: Adrian Serrano <[email protected]>
elastic · Oct 8, 2021 · d6a5598 · d6a5598
1 parent ad093c0
commit d6a5598
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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 → testing/environments/prev-minor.yml b/testing/environments/7.11.yml → 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
@@ -29,7 +29,7 @@ services:
   kibana:
     image: docker.elastic.co/kibana/kibana-oss:7.16.0-76e5f71e-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
@@ -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