Merge branch 'main' into fix-ms-defender-runscript-slow-tests

Author: szwarckonrad

.buildkite/ftr_platform_stateful_configs.yml

@@ -59,7 +59,6 @@ disabled:
   # Gen AI suites, running with their own pipeline
   - x-pack/platform/test/functional_gen_ai/inference/config.ts
   - x-pack/platform/test/functional_gen_ai/inference/generate_artifacts.config.ts
-  - x-pack/platform/test/agent_builder/smoke_tests/config.stateful.ts
 
 defaultQueue: 'n2-4-spot'
 enabled:
@@ -486,7 +485,6 @@ enabled:
   - x-pack/platform/test/encrypted_saved_objects_api_integration/config.ts
   - x-pack/platform/test/fleet_multi_cluster/config.ts
   - x-pack/platform/test/monitoring_api_integration/config.ts
-  - x-pack/platform/test/agent_builder_functional/config.ts
   - x-pack/platform/test/plugin_api_integration/config.ts
   - x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_basic.ts
   - x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts

.buildkite/ftr_search_serverless_configs.yml

@@ -36,4 +36,3 @@ enabled:
   - x-pack/platform/test/serverless/functional/configs/search/config.group19.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.group20.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.feature_flags.ts
-  - x-pack/platform/test/agent_builder_api_integration/configs/config.serverless.ts

.buildkite/ftr_search_stateful_configs.yml

@@ -11,4 +11,3 @@ enabled:
   - x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts
   - x-pack/solutions/search/test/functional_solution_sidenav/config.ts
   - x-pack/solutions/search/test/accessibility/config.ts
-  - x-pack/platform/test/agent_builder_api_integration/configs/config.stateful.ts

.buildkite/pipelines/agent_builder/smoke_tests.yml

@@ -42,34 +42,6 @@ steps:
 
   - wait
 
-  - command: |
-      mkdir -p target
-      buildkite-agent artifact download 'target/eis_models.json' . --step discover-eis-models || echo '{"models":[]}' > target/eis_models.json
-      .buildkite/scripts/steps/test/ftr_configs.sh
-    env:
-      FTR_GEN_AI: '1'
-      FTR_EIS_CCM: '1'
-      FTR_GEN_AI_LLM_SAMPLE_SIZE: 'all'
-      FTR_CONFIG: 'x-pack/platform/test/agent_builder/smoke_tests/config.stateful.ts'
-      FTR_CONFIG_GROUP_KEY: 'ftr-agent-builder-smoke-tests'
-    label: Agent Builder FTR Smoke Tests
-    key: ftr-agent-builder-smoke-tests
-    depends_on: discover-eis-models
-    timeout_in_minutes: 50
-    parallelism: 1
-    agents:
-      image: family/kibana-ubuntu-2404
-      imageProject: elastic-images-prod
-      provider: gcp
-      machineType: n2-standard-4
-      preemptible: true
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-        - exit_status: '*'
-          limit: 1
-
   - command: |
       mkdir -p target
       buildkite-agent artifact download 'target/eis_models.json' . --step discover-eis-models || echo '{"models":[]}' > target/eis_models.json

.buildkite/pipelines/pull_request/agent_builder_smoke_tests.yml

@@ -23,31 +23,6 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: |
-          mkdir -p target
-          buildkite-agent artifact download 'target/eis_models.json' . --step discover-eis-models || echo '{"models":[]}' > target/eis_models.json
-          .buildkite/scripts/steps/test/ftr_configs.sh
-        env:
-          FTR_GEN_AI: '1'
-          FTR_EIS_CCM: '1'
-          FTR_CONFIG: 'x-pack/platform/test/agent_builder/smoke_tests/config.stateful.ts'
-          FTR_CONFIG_GROUP_KEY: 'ftr-agent-builder-smoke-tests'
-        label: Agent Builder FTR Smoke Tests
-        key: ftr-agent-builder-smoke-tests
-        depends_on: discover-eis-models
-        timeout_in_minutes: 50
-        parallelism: 1
-        agents:
-          machineType: n2-standard-4
-          preemptible: true
-          spotZones: us-central1-f,us-central1-c,us-central1-a
-        retry:
-          automatic:
-            - exit_status: '-1'
-              limit: 3
-            - exit_status: '*'
-              limit: 1
-
       - command: |
           mkdir -p target
           buildkite-agent artifact download 'target/eis_models.json' . --step discover-eis-models || echo '{"models":[]}' > target/eis_models.json

.buildkite/pipelines/pull_request/base.yml

@@ -1,3 +1,6 @@
+env:
+  KBN_ES_SNAPSHOT_USE_CACHED: 'true'
+
 steps:
   - command: .buildkite/scripts/steps/build_kibana.sh
     label: Build Kibana Distribution

.buildkite/pipelines/version_bump.yml

@@ -8,7 +8,7 @@ notify:
       channels:
         - '#mission-control'
       message: |
-        Kibana has been bumped to `${NEW_VERSION}` on branch `${BRANCH}` and a DRA build has begun.
+        Kibana has been bumped to `${NEW_VERSION}` on branch `${BRANCH}`.
         Build: ${BUILDKITE_BUILD_URL}
     if: build.state == "passed"
 

.buildkite/pipelines/version_bump/create_new_branch.yml

@@ -2,3 +2,8 @@ steps:
   - name: 'Create new release branch'
     key: create-new-branch
     command: .buildkite/scripts/steps/version_bump/create_new_branch_of_main.sh
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-4

.buildkite/pipelines/version_bump/ensure_version_label.yml

@@ -2,3 +2,8 @@ steps:
   - name: 'Ensure version label exists'
     key: ensure-version-label
     command: .buildkite/scripts/steps/version_bump/ensure_version_label.sh
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-4

.buildkite/pipelines/version_bump/notify_branch_created.yml

@@ -2,3 +2,8 @@ steps:
   - name: 'Notify Slack: branch created'
     key: notify-branch-created
     command: .buildkite/scripts/steps/version_bump/notify_branch_created.sh
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-4