Skip to content

Commit 70e32ae

Browse files
elasticmachineelasticmachine
authored
Merge branch 'main' into execution-type-field
2 parents 8417f4e + 5154352 commit 70e32ae

2,358 files changed

Lines changed: 42816 additions & 22906 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.

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ disabled:
3434

3535
# Cypress configs, for now these are still run manually
3636
- x-pack/test/fleet_cypress/cli_config.ts
37+
- x-pack/test/fleet_cypress/cli_config.space_awareness.ts
3738
- x-pack/test/fleet_cypress/config.ts
39+
- x-pack/test/fleet_cypress/config.space_awareness.ts
3840
- x-pack/test/fleet_cypress/visual_config.ts
3941

4042
defaultQueue: 'n2-4-spot'

‎.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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-deploy-project-from-pr
6+
description: 'Builds and deploys a Kibana serverless project from a PR'
7+
links:
8+
- url: 'https://buildkite.com/elastic/kibana-deploy-project-from-pr'
9+
title: Pipeline link
10+
spec:
11+
type: buildkite-pipeline
12+
system: buildkite
13+
owner: 'group:kibana-operations'
14+
implementation:
15+
apiVersion: buildkite.elastic.dev/v1
16+
kind: Pipeline
17+
metadata:
18+
name: kibana / deploy project from PR
19+
description: 'Builds and deploys a Kibana serverless project from a PR'
20+
spec:
21+
env:
22+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
23+
24+
allow_rebuilds: false
25+
branch_configuration: main
26+
default_branch: main
27+
repository: elastic/kibana
28+
pipeline_file: .buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml
29+
skip_intermediate_builds: true
30+
provider_settings:
31+
prefix_pull_request_fork_branch_names: false
32+
skip_pull_request_builds_for_existing_commits: true
33+
trigger_mode: none
34+
teams:
35+
kibana-operations:
36+
access_level: MANAGE_BUILD_AND_READ
37+
appex-qa:
38+
access_level: MANAGE_BUILD_AND_READ
39+
kibana-tech-leads:
40+
access_level: MANAGE_BUILD_AND_READ
41+
everyone:
42+
access_level: BUILD_AND_READ
43+
tags:
44+
- kibana

‎.buildkite/pipeline-resource-definitions/kibana-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ spec:
2020
spec:
2121
env:
2222
ELASTIC_PR_COMMENTS_ENABLED: 'true'
23-
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
24-
ELASTIC_GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
23+
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
24+
GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
2525
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
2626
allow_rebuilds: true
2727
branch_configuration: ''

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ spec:
1616
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-chrome-forward-testing.yml
1717
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-codeql.yml
1818
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-coverage-daily.yml
19+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml
1920
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
2021
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-serverless-snapshots.yml
2122
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml

‎.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ steps:
5454
env:
5555
FTR_CONFIGS_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh"
5656
JEST_INTEGRATION_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh"
57-
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts"
57+
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/test/api_integration/deployment_agnostic/configs/serverless/**"
5858
FTR_EXTRA_ARGS: "$FTR_EXTRA_ARGS"
5959
LIMIT_CONFIG_TYPE: "functional,integration"
6060
retry:

‎.buildkite/pipelines/quality-gates/emergency/pipeline.tests-production.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
env:
1111
TARGET_ENV: production
1212
CHECK_SLO: true
13-
CHECK_SLO_TAG: kibana
13+
CHECK_SLO_TAG: kbn-quality-gate
1414
CHECK_SLO_WAITING_PERIOD: 15m
1515
CHECK_SLO_BURN_RATE_THRESHOLD: 0.1
1616
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}

‎.buildkite/pipelines/quality-gates/emergency/pipeline.tests-staging.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ steps:
4646
command: "make -C /agent trigger-manual-verification-phase"
4747
agents:
4848
image: "docker.elastic.co/ci-agent-images/manual-verification-agent:0.0.6"
49+
if: build.env("DEPLOYMENT_SLICES") =~ /.*staging-ds-2.*/

‎.buildkite/pipelines/quality-gates/pipeline.tests-production.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
env:
1111
TARGET_ENV: production
1212
CHECK_SLO: true
13-
CHECK_SLO_TAG: kibana
13+
CHECK_SLO_TAG: kbn-quality-gate
1414
CHECK_SLO_WAITING_PERIOD: 15m
1515
CHECK_SLO_BURN_RATE_THRESHOLD: 0.1
1616
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}

‎.buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
agents:
2+
provider: gcp
3+
image: family/kibana-ubuntu-2004
4+
imageProject: elastic-images-prod
5+
6+
steps:
7+
- command: .buildkite/scripts/lifecycle/pre_build.sh
8+
label: Pre-Build
9+
timeout_in_minutes: 10
10+
agents:
11+
machineType: n2-standard-2
12+
retry:
13+
automatic:
14+
- exit_status: '*'
15+
limit: 1
16+
17+
- wait: ~
18+
19+
- command: .buildkite/scripts/steps/build_kibana.sh
20+
label: Build Kibana Distribution and Plugins
21+
agents:
22+
machineType: n2-standard-16
23+
preemptible: true
24+
key: build
25+
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
26+
timeout_in_minutes: 90
27+
retry:
28+
automatic:
29+
- exit_status: '-1'
30+
limit: 3
31+
32+
- wait: ~
33+
34+
- command: .buildkite/scripts/steps/artifacts/docker_image.sh
35+
label: 'Build Project Image'
36+
key: build_project_image
37+
agents:
38+
machineType: n2-standard-16
39+
preemptible: true
40+
timeout_in_minutes: 60
41+
retry:
42+
automatic:
43+
- exit_status: '-1'
44+
limit: 3
45+
46+
- wait: ~
47+
48+
- command: .buildkite/scripts/steps/serverless/deploy.sh
49+
label: 'Deploy Project'
50+
agents:
51+
machineType: n2-standard-4
52+
preemptible: true
53+
timeout_in_minutes: 10

‎.buildkite/pull_requests.json‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"^\\.backportrc\\.json$",
3131
"^nav-kibana-dev\\.docnav\\.json$",
3232
"^src/dev/prs/kibana_qa_pr_list\\.json$",
33-
"^\\.buildkite/pull_requests\\.json$"
33+
"^\\.buildkite/pull_requests\\.json$",
34+
"^\\.devcontainer/"
3435
],
3536
"always_require_ci_on_changed": [
3637
"^docs/developer/plugin-list.asciidoc$",
@@ -46,6 +47,30 @@
4647
"/__snapshots__/",
4748
"\\.test\\.(ts|tsx|js|jsx)"
4849
]
50+
},
51+
{
52+
"repoOwner": "elastic",
53+
"repoName": "kibana",
54+
"pipelineSlug": "kibana-deploy-project-from-pr",
55+
56+
"enabled": true,
57+
"allow_org_users": true,
58+
"allowed_repo_permissions": ["admin", "write"],
59+
"allowed_list": ["elastic-vault-github-plugin-prod[bot]"],
60+
"set_commit_status": false,
61+
"build_on_commit": false,
62+
"build_on_comment": false,
63+
"build_drafts": false,
64+
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:deploy)\\W+(?:project))$",
65+
"kibana_versions_check": true,
66+
"kibana_build_reuse": true,
67+
"kibana_build_reuse_pipeline_slugs": ["kibana-pull-request", "kibana-on-merge", "kibana-deploy-project-from-pr"],
68+
"kibana_build_reuse_regexes": [
69+
"^test/",
70+
"^x-pack/test/",
71+
"/__snapshots__/",
72+
"\\.test\\.(ts|tsx|js|jsx)"
73+
]
4974
}
5075
]
5176
}

0 commit comments

Comments
 (0)