diff --git a/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml b/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml deleted file mode 100644 index 9fd040aef819e..0000000000000 --- a/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml +++ /dev/null @@ -1,49 +0,0 @@ -# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json -apiVersion: backstage.io/v1alpha1 -kind: Resource -metadata: - name: bk-kibana-on-merge-unsupported-ftrs - description: Runs unsupported ftr tests for each commit of Kibana - links: - - url: 'https://buildkite.com/elastic/kibana-on-merge-unsupported-ftrs' - title: Pipeline link -spec: - type: buildkite-pipeline - owner: 'group:kibana-operations' - system: buildkite - implementation: - apiVersion: buildkite.elastic.dev/v1 - kind: Pipeline - metadata: - name: kibana / on merge unsupported ftrs - description: Runs unsupported ftr tests for each commit of Kibana - spec: - env: - SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts' - ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' - SCOUT_REPORTER_ENABLED: 'true' - allow_rebuilds: true - branch_configuration: main 9.4 9.3 9.2 8.19 - default_branch: main - repository: elastic/kibana - pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml - skip_intermediate_builds: false - provider_settings: - build_branches: false - build_pull_requests: false - publish_commit_status: false - trigger_mode: none - build_tags: false - prefix_pull_request_fork_branch_names: false - skip_pull_request_builds_for_existing_commits: false - teams: - everyone: - access_level: BUILD_AND_READ - kibana-operations: - access_level: MANAGE_BUILD_AND_READ - appex-qa: - access_level: MANAGE_BUILD_AND_READ - kibana-tech-leads: - access_level: MANAGE_BUILD_AND_READ - tags: - - kibana diff --git a/.buildkite/pipeline-resource-definitions/locations.yml b/.buildkite/pipeline-resource-definitions/locations.yml index e8cdb1566b78a..e1cd6d28c7c3b 100644 --- a/.buildkite/pipeline-resource-definitions/locations.yml +++ b/.buildkite/pipeline-resource-definitions/locations.yml @@ -36,7 +36,6 @@ spec: - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-migration-staging.yml - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-node-glibc-217.yml - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-node-pointer-compression.yml - - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-otel-semconv-sync.yml - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-package-registry.yml diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml index 26e988dbb2062..e6afcb6b4a702 100644 --- a/.buildkite/pipelines/on_merge.yml +++ b/.buildkite/pipelines/on_merge.yml @@ -166,22 +166,22 @@ steps: - exit_status: '-1' limit: 3 -# - command: .buildkite/scripts/steps/checks/api_contracts.sh -# label: 'Check API Contracts' -# agents: -# image: family/kibana-ubuntu-2404 -# imageProject: elastic-images-prod -# provider: gcp -# machineType: n2d-standard-2 -# preemptible: true -# spotZones: us-central1-c,us-central1-a -# depends_on: check_oas_snapshot -# timeout_in_minutes: 30 -# soft_fail: true -# retry: -# automatic: -# - exit_status: '-1' -# limit: 3 + # - command: .buildkite/scripts/steps/checks/api_contracts.sh + # label: 'Check API Contracts' + # agents: + # image: family/kibana-ubuntu-2404 + # imageProject: elastic-images-prod + # provider: gcp + # machineType: n2d-standard-2 + # preemptible: true + # spotZones: us-central1-c,us-central1-a + # depends_on: check_oas_snapshot + # timeout_in_minutes: 30 + # soft_fail: true + # retry: + # automatic: + # - exit_status: '-1' + # limit: 3 - command: .buildkite/scripts/steps/on_merge_api_docs.sh label: Check Public API Docs @@ -271,22 +271,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"