From 604e40d782afafab01e6274e93eec5c2b201523a Mon Sep 17 00:00:00 2001
From: Nicolas Ruflin <spam@ruflin.com>
Date: Thu, 24 Mar 2022 10:22:43 +0100
Subject: [PATCH] Remove prev-minor testing as not needed anymore (#30926)

In https://github.com/elastic/beats/issues/26629 the issue around running Filebeat against older version of Elasticsearch was discussed and in https://github.com/elastic/beats/pull/28274 testing against the previous minor was introduced. But since 8.0, Filebeat can only ship data to equal or newer versions of Elasticsearch. Because of this, in the tests `TESTING_FILEBEAT_ALLOW_OLDER=1` had to be introduced.

I'm opening this PR to remove this testing as it is not something we support anymore.
---
 filebeat/Jenkinsfile.yml            |  9 -------
 testing/environments/prev-minor.yml | 38 -----------------------------
 x-pack/filebeat/Jenkinsfile.yml     |  9 -------
 3 files changed, 56 deletions(-)
 delete mode 100644 testing/environments/prev-minor.yml

diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml
index c77a51b6a4b..555c2359137 100644
--- a/filebeat/Jenkinsfile.yml
+++ b/filebeat/Jenkinsfile.yml
@@ -44,15 +44,6 @@ stages:
     pythonIntegTest:
         mage: "mage pythonIntegTest"       ## run the ITs only if the changeset affects a specific module.
         stage: mandatory
-    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
-        TESTING_FILEBEAT_ALLOW_OLDER=1
-        PYTEST_ADDOPTS='-k test_modules'
-        mage pythonIntegTest
-      withModule: true
-      stage: mandatory
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
diff --git a/testing/environments/prev-minor.yml b/testing/environments/prev-minor.yml
deleted file mode 100644
index 5daa3b37a3f..00000000000
--- a/testing/environments/prev-minor.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# This is the previous minor for compatibility tests.
-
-version: '2.3'
-services:
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0-rc1
-    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:8.0.0-rc1
-    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:8.0.0-rc1
-    healthcheck:
-      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 fe98545ac2c..cae4ba49ce7 100644
--- a/x-pack/filebeat/Jenkinsfile.yml
+++ b/x-pack/filebeat/Jenkinsfile.yml
@@ -44,15 +44,6 @@ stages:
     pythonIntegTest:
         mage: "mage pythonIntegTest"       ## run the ITs only if the changeset affects a specific module.
         stage: mandatory
-    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
-        TESTING_FILEBEAT_ALLOW_OLDER=1
-        PYTEST_ADDOPTS='-k test_xpack_modules'
-        mage pythonIntegTest
-      withModule: true
-      stage: mandatory
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.