Skip to content

Commit 2c7b255

Browse files
authored
Merge branch 'connectors-auth-code-grant' into lb/fix-pkce-code
2 parents 366c472 + 184a1b4 commit 2c7b255

3,773 files changed

Lines changed: 106031 additions & 20611 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.agents/skills/scout-best-practices-reviewer/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Important: Do not post GitHub comments unless explicitly stated.
4242
- **UI scope**: UI tests should focus on user interactions and rendering; avoid “data correctness” assertions (for example exact API response shapes or exact table cell values) unless the UI behavior depends on them. Prefer Scout API tests (or unit/integration) for data correctness coverage.
4343
- **Isolation**: parallel-safe data and resilient cleanup in hooks; no reliance on file ordering or shared mutable state.
4444
- **RBAC / realism**: minimal permissions (avoid `admin` unless required); space-aware behavior covered or explicitly out of scope.
45-
- **Flake traps**: avoid `waitForTimeout()` and time-based assertions/retries; rely on auto-waiting + explicit readiness signals.
45+
- **Flake traps**: avoid `waitForTimeout()` and time-based assertions/retries; rely on auto-waiting + explicit readiness signals. Some locators are restricted by `@kbn/eslint/scout_no_locators` (e.g. `globalLoadingIndicator`).
4646
- **Cost**: avoid repeating expensive setup; consider a global setup hook for shared one-time operations.
4747
- **Tags / environment**: validate deployment tags and avoid assumptions that only hold in specific environments.
4848

.agents/skills/scout-ui-testing/SKILL.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ test('creates and verifies a dashboard', async ({ pageObjects, page }) => {
9595

9696
- Don’t use `page.waitForTimeout`. Wait on a page-ready signal (loading indicator hidden, container visible, `expect.poll` on element counts).
9797
- If selectors aren’t stable, add `data-test-subj` (Scout uses it as the `testIdAttribute`).
98+
- Some locators are restricted by `@kbn/eslint/scout_no_locators` (e.g. `globalLoadingIndicator`). Don’t use them in tests or page objects for app loading state management; rely on Playwright auto-waiting and page-ready signals instead.
9899

99100
## A11y checks (optional, high value)
100101

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ enabled:
111111
- src/platform/test/functional/apps/visualize/group4/config.ts
112112
- src/platform/test/functional/apps/visualize/group5/config.ts
113113
- src/platform/test/functional/apps/visualize/group6/config.ts
114-
- src/platform/test/functional/apps/visualize/replaced_vislib_chart_types/config.ts
114+
- src/platform/test/functional/apps/visualize/replaced_vislib_chart_types/group1/config.ts
115+
- src/platform/test/functional/apps/visualize/replaced_vislib_chart_types/group2/config.ts
116+
- src/platform/test/functional/apps/visualize/replaced_vislib_chart_types/group3/config.ts
115117
- src/platform/test/functional/config.ccs.ts
116118
- src/platform/test/functional/firefox/console.config.ts
117119
- src/platform/test/functional/firefox/dashboard.config.ts
@@ -406,6 +408,7 @@ enabled:
406408
- x-pack/platform/test/api_integration/apis/monitoring_collection/config.ts
407409
- x-pack/platform/test/api_integration/apis/osquery/config.ts
408410
- x-pack/platform/test/api_integration/apis/search/config.ts
411+
- x-pack/platform/test/api_integration/apis/search_inference_endpoints/config.ts
409412
- x-pack/platform/test/api_integration/apis/searchprofiler/config.ts
410413
- x-pack/platform/test/api_integration/apis/security/config_security_trial.ts
411414
- x-pack/platform/test/api_integration/apis/spaces/config.ts

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ disabled:
3131
defaultQueue: 'n2-4-spot'
3232
enabled:
3333
- x-pack/solutions/security/test/serverless/api_integration/configs/config.ts
34+
- x-pack/solutions/security/test/serverless/api_integration/configs/config.graph.ts
35+
- x-pack/solutions/security/test/serverless/api_integration/configs/config.graph_essentials.ts
3436
- x-pack/platform/test/serverless/api_integration/configs/security/config.group1.ts
3537
- x-pack/solutions/security/test/serverless/api_integration/test_suites/fleet/config.ts
3638
- x-pack/solutions/security/test/serverless/functional/configs/config.screenshots.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ enabled:
136136
- x-pack/solutions/security/test/security_solution_endpoint/configs/integrations.config.ts
137137
- x-pack/solutions/security/test/api_integration/apis/cloud_security_posture/config.ts
138138
- x-pack/solutions/security/test/cloud_security_posture_api/config.ts
139+
- x-pack/solutions/security/test/cloud_security_posture_api/config.graph_basic.ts
139140
- x-pack/solutions/security/test/cloud_security_posture_functional/group1/config.ts
140141
- x-pack/solutions/security/test/cloud_security_posture_functional/group2/config.ts
141142
- x-pack/solutions/security/test/cloud_security_posture_functional/group3/config.ts
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
2+
apiVersion: backstage.io/v1alpha1
3+
kind: Resource
4+
metadata:
5+
name: bk-kibana-vm-build-orchestrator
6+
description: Build CI agent VM images for Kibana
7+
links:
8+
- url: "https://buildkite.com/elastic/kibana-vm-build-orchestrator"
9+
title: Pipeline link
10+
spec:
11+
type: buildkite-pipeline
12+
owner: group:kibana-operations
13+
system: buildkite
14+
implementation:
15+
apiVersion: buildkite.elastic.dev/v1
16+
kind: Pipeline
17+
metadata:
18+
name: kibana / VM build orchestrator
19+
description: Build CI agent VM images for Kibana
20+
spec:
21+
env:
22+
SLACK_NOTIFICATIONS_CHANNEL: "#kibana-operations-alerts"
23+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
24+
default_branch: main
25+
repository: elastic/kibana
26+
pipeline_file: .buildkite/pipelines/orchestrate_vm_builds.yml
27+
provider_settings:
28+
trigger_mode: none
29+
teams:
30+
kibana-operations:
31+
access_level: MANAGE_BUILD_AND_READ
32+
everyone:
33+
access_level: BUILD_AND_READ

.buildkite/pipeline-resource-definitions/locations.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-storybooks-from-pr.yml
5656
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-uiam-cosmos-db-emulator-verify-and-promote.yml
5757
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-uiam-verify-and-promote.yml
58+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-vm-build-orchestrator.yml
5859
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml
5960
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/scalability_testing-daily.yml
6061
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/security-solution-ess/gen-ai-evals.yml

.buildkite/pipelines/on_merge_fanout.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ steps:
460460

461461
- command: .buildkite/scripts/steps/functional/defend_workflows.sh
462462
label: 'Defend Workflows Cypress Tests'
463+
soft_fail: true # todo: remove once issue is fixed
463464
agents:
464465
image: family/kibana-ubuntu-2404
465466
imageProject: elastic-images-prod
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/refs/heads/main/schema.json
2+
steps:
3+
- block: 'Choose VM images branch'
4+
prompt: 'Enter the branch to use for kibana-vm-images builds'
5+
if: "build.env('VM_IMAGES_BRANCH') == null || build.env('VM_IMAGES_BRANCH') == ''"
6+
fields:
7+
- text: 'VM_IMAGES_BRANCH'
8+
key: 'VM_IMAGES_BRANCH'
9+
hint: 'Branch in elastic/ci-agent-images to run'
10+
required: true
11+
12+
- name: 'Build base image'
13+
key: build-base-image
14+
trigger: kibana-vm-images
15+
async: false
16+
build:
17+
branch: '${VM_IMAGES_BRANCH}'
18+
env:
19+
IMAGES_CONFIG: kibana/base_image.yml
20+
- name: 'Build packages layer'
21+
key: build-packages-layer
22+
depends_on: build-base-image
23+
trigger: kibana-vm-images
24+
async: false
25+
build:
26+
branch: '${VM_IMAGES_BRANCH}'
27+
env:
28+
IMAGES_CONFIG: kibana/packages_layer.yml
29+
BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml'
30+
31+
- name: 'Build image cache'
32+
depends_on: build-packages-layer
33+
trigger: kibana-vm-images
34+
async: false
35+
build:
36+
branch: '${VM_IMAGES_BRANCH}'
37+
env:
38+
IMAGES_CONFIG: kibana/image_cache.tpl.yml
39+
BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml,kibana/packages_layer.yml'

.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
steps:
22
- command: .buildkite/scripts/steps/functional/defend_workflows.sh
3+
soft_fail: true # todo: remove once issue is fixed
34
label: 'Defend Workflows Cypress Tests'
45
agents:
56
enableNestedVirtualization: true

0 commit comments

Comments
 (0)