diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml index 7bb3e184a5099..729f1d569e265 100644 --- a/.buildkite/pipelines/on_merge.yml +++ b/.buildkite/pipelines/on_merge.yml @@ -236,22 +236,6 @@ steps: - exit_status: '*' limit: 1 - - command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh' - label: Trigger unsupported ftr tests - timeout_in_minutes: 10 - agents: - image: family/kibana-ubuntu-2404 - imageProject: elastic-images-prod - provider: gcp - machineType: n2-standard-2 - depends_on: - - build - - quick_checks - - checks - - linting - - linting_with_types - - check_types - - command: .buildkite/scripts/steps/storybooks/build_and_upload.sh label: 'Build Storybooks' agents: diff --git a/.buildkite/pipelines/on_merge_unsupported_ftrs.yml b/.buildkite/pipelines/on_merge_unsupported_ftrs.yml deleted file mode 100644 index 80dc6efbd94e0..0000000000000 --- a/.buildkite/pipelines/on_merge_unsupported_ftrs.yml +++ /dev/null @@ -1,30 +0,0 @@ -steps: - - command: .buildkite/scripts/lifecycle/pre_build.sh - label: Pre-Build - timeout_in_minutes: 10 - agents: - image: family/kibana-ubuntu-2404 - imageProject: elastic-images-prod - provider: gcp - machineType: n2-standard-2 - retry: - automatic: - - exit_status: '*' - limit: 1 - - - command: .buildkite/scripts/steps/build_kibana.sh - label: Build Kibana Distribution - agents: - image: family/kibana-ubuntu-2404 - imageProject: elastic-images-prod - provider: gcp - machineType: n2-standard-8 - preemptible: true - key: build - if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''" - timeout_in_minutes: 60 - retry: - automatic: - - exit_status: '-1' - limit: 3 - diff --git a/.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh b/.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh deleted file mode 100755 index 65fd59f53b94c..0000000000000 --- a/.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -echo "--- Trigger unsupported ftr tests" -ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-on-merge-unsupported-ftrs "$BUILDKITE_BRANCH" "$BUILDKITE_COMMIT" "$BUILDKITE_BUILD_ID"