Separate pull request CI jobs based on target branch. (#187)

* Keep only 8.x related CI jobs in 8.x branch and remove main CI jobs.

* Add 8.previous CI jobs.

* Remove Build and E2E pipeline definitions from 8.x branch.

* Remove 8.previous (8.15) as ES GeoIP interface differs from 8.current (8.16).

Author: mashhurs

.buildkite/build-pipeline.yml

@@ -1,43 +1 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
-
-agents:
-  provider: "gcp"
-  machineType: "n1-standard-4"
-  image: family/core-ubuntu-2204
-
-steps:
-  - label: ":hammer: Build plugin with LS & ES 8.x :elasticsearch:"
-    # Builds with LS and ES last 8.x released version
-    # Runs integration tests on 8.x released versions
-    command:
-      - .buildkite/scripts/run_tests.sh
-    env:
-      ELASTIC_STACK_VERSION: "8.current"
-      SNAPSHOT: false
-      INTEGRATION: true
-      SECURE_INTEGRATION: true
-      TARGET_BRANCH: "8.x"
-
-  - label: ":hammer: Build plugin with LS 8.x-SNAPSHOT & ES `main` branch :elasticsearch:"
-    # Builds with LS last 8.x released version and ES main
-    # Runs integration tests on 8.x released versions
-    command:
-      - .buildkite/scripts/run_tests.sh
-    env:
-      ELASTIC_STACK_VERSION: "8.current"
-      ELASTICSEARCH_TREEISH: "main"
-      SNAPSHOT: true
-      INTEGRATION: true
-      SECURE_INTEGRATION: true
-
-  - label: ":hammer: Build plugin with LS & ES `main` branch :elasticsearch:"
-    # Builds with LS last 8.x released version and ES main
-    # Runs integration tests on 8.x released versions
-    command:
-      - .buildkite/scripts/run_tests.sh
-    env:
-      ELASTIC_STACK_VERSION: "main"
-      ELASTICSEARCH_TREEISH: "main"
-      SNAPSHOT: true
-      INTEGRATION: true
-      SECURE_INTEGRATION: true
+# Intentional empty definition because it is in 8.x

.buildkite/e2e-pipeline.yml

@@ -1,38 +1 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
-
-agents:
-  provider: gcp
-  imageProject: elastic-images-prod
-  image: family/platform-ingest-logstash-multi-jdk-ubuntu-2204
-  machineType: "n2-standard-4"
-  diskSizeGb: 120
-
-steps:
-  # ------------- Run E2E tests ---------------------
-  - label: ":test_tube: Run E2E tests with LS 8.x :rocket:"
-    # uses the LS main & plugin 8.x branch when building the plugin
-    # Runs integration tests against 8.x release version
-    command:
-      - .buildkite/scripts/run_e2e_tests.sh
-    env:
-      ELASTIC_STACK_VERSION: "8.current"
-      TARGET_BRANCH: "8.x"
-
-  - label: ":test_tube: Run E2E tests with LS 8.x-SNAPSHOT :rocket:"
-    # uses the LS & plugin main branch when building the plugin
-    # Runs integration tests against 8.x-SNAPSHOT version
-    command:
-      - .buildkite/scripts/run_e2e_tests.sh
-    env:
-      ELASTIC_STACK_VERSION: "8.current"
-      SNAPSHOT: true
-
-  - label: ":test_tube: Run E2E tests with LS `main` :rocket:"
-    # uses the LS & plugin main branch when building the plugin
-    # Runs integration tests against snapshot.main of https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash_releases.json
-    command:
-      - .buildkite/scripts/run_e2e_tests.sh
-    env:
-      ELASTIC_STACK_VERSION: main
-      SNAPSHOT: true
-      ELASTICSEARCH_TREEISH: main
+# Intentional empty definition because it is in 8.x

.buildkite/pull-request-pipeline.yml

@@ -6,41 +6,43 @@ agents:
 
 steps:
   # ------------- Unit tests ---------------------
-  - label: ":hammer: Unit tests with LS & ES 8.x-SNAPSHOT :docker:"
-    # Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES version defined in gradle.properties
-    # Runs unit tests on LS & ES 8.x-SNAPSHOT docker
+  - label: ":hammer: Unit tests with LS & ES 8.current :docker:"
+    # Builds the plugin (with current changes) with the version defined in gradle.properties
+    #   and against LS and ES 8.current
+    # Runs unit tests on LS & ES 8.current docker
     command:
       - .buildkite/scripts/run_tests.sh
     env:
       ELASTIC_STACK_VERSION: "8.current"
-      SNAPSHOT: true
       INTEGRATION: false
 
-  - label: ":hammer: Unit tests with LS 8.x-SNAPSHOT & ES main :docker:"
-    # Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES main
-    # Runs unit tests on LS & ES 8.x-SNAPSHOT docker
+  - label: ":hammer: Unit tests with LS & ES 8.current-SNAPSHOT :docker:"
+    # Builds the plugin (with current changes) with the version defined in gradle.properties
+    #   and against LS and ES 8.current-SNAPSHOT
+    # Runs unit tests on LS & ES 8.current-SNAPSHOT docker
     command:
       - .buildkite/scripts/run_tests.sh
     env:
       ELASTIC_STACK_VERSION: "8.current"
-      ELASTICSEARCH_TREEISH: main
-      INTEGRATION: false
       SNAPSHOT: true
+      INTEGRATION: false
 
   # ------------- Integration tests ---------------------
-  - label: ":hammer: Integration tests with LS & ES 8.x :docker:"
-    # Builds the plugin (with current changes) against LS 8.x and ES version defined in gradle.properties
-    # Runs integration tests on LS & ES 8.x docker
+  - label: ":hammer: Integration tests with LS & ES 8.current :docker:"
+    # Builds the plugin (with current changes) with the version defined in gradle.properties
+    #   and against LS and ES 8.current
+    # Runs integration tests on LS & ES 8.current docker
     command:
       - .buildkite/scripts/run_tests.sh
     env:
       ELASTIC_STACK_VERSION: "8.current"
       INTEGRATION: true
       SECURE_INTEGRATION: true
 
-  - label: ":hammer: Integration tests with LS & ES 8.x-SNAPSHOT :docker:"
-    # Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES version defined in gradle.properties
-    # Runs integration tests on LS & ES 8.x-SNAPSHOT docker
+  - label: ":hammer: Integration tests with LS & ES 8.current-SNAPSHOT :docker:"
+    # Builds the plugin (with current changes) with the version defined in gradle.properties
+    #   and against LS and ES 8.current-SNAPSHOT
+    # Runs integration tests on LS & ES 8.current-SNAPSHOT docker
     command:
       - .buildkite/scripts/run_tests.sh
     env:
@@ -49,29 +51,3 @@ steps:
       INTEGRATION: true
       SECURE_INTEGRATION: true
       LOG_LEVEL: "info"
-
-  - label: ":hammer: Integration tests with LS 8.x-SNAPSHOT & ES main :docker:"
-    # Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES main
-    # Runs integration tests on LS & ES 8.x-SNAPSHOT docker
-    command:
-      - .buildkite/scripts/run_tests.sh
-    env:
-      ELASTIC_STACK_VERSION: "8.current"
-      ELASTICSEARCH_TREEISH: "main"
-      SNAPSHOT: true
-      INTEGRATION: true
-      SECURE_INTEGRATION: true
-      LOG_LEVEL: "info"
-
-  - label: ":hammer: Integration tests with LS & ES main :docker:"
-    # Builds the plugin (with current changes) against LS and ES main
-    # Runs integration tests on snapshot.main of https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash_releases.json
-    command:
-      - .buildkite/scripts/run_tests.sh
-    env:
-      ELASTIC_STACK_VERSION: main
-      ELASTICSEARCH_TREEISH: main
-      SNAPSHOT: true
-      INTEGRATION: true
-      SECURE_INTEGRATION: true
-      LOG_LEVEL: "info"