Skip to content

Commit a8e5451

Browse files
damian-polewskidamian-polewski
authored
Merge branch 'main' into streams/update_classic_wired_forever_badges
2 parents 446d25d + 4efa411 commit a8e5451

1,989 files changed

Lines changed: 51274 additions & 13786 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ enabled:
170170
- x-pack/platform/test/fleet_api_integration/config.fleet.ts
171171
- x-pack/platform/test/fleet_api_integration/config.package_policy.ts
172172
- x-pack/platform/test/fleet_api_integration/config.space_awareness.ts
173+
- x-pack/platform/test/fleet_api_integration/config.cloud_connector.ts
173174
- x-pack/platform/test/fleet_functional/config.ts
174175
- x-pack/platform/test/fleet_tasks/config.ts
175176
- x-pack/platform/test/ftr_apis/security_and_spaces/config.ts
@@ -398,7 +399,7 @@ enabled:
398399
- x-pack/platform/test/encrypted_saved_objects_api_integration/config.ts
399400
- x-pack/platform/test/fleet_multi_cluster/config.ts
400401
- x-pack/platform/test/monitoring_api_integration/config.ts
401-
- x-pack/platform/test/onechat_api_integration/config.ts
402+
- x-pack/platform/test/onechat_api_integration/configs/config.stateful.ts
402403
- x-pack/platform/test/plugin_api_integration/config.ts
403404
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_basic.ts
404405
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,8 @@ export async function pickScoutTestGroupRunOrder(scoutConfigsPath: string) {
601601
[
602602
{
603603
group: 'Scout Configs',
604-
depends_on: ['build'],
604+
key: 'scout-configs',
605+
depends_on: ['build_scout_tests'],
605606
steps: scoutGroups.map(
606607
({ title, key, group, usesParallelWorkers }): BuildkiteStep => ({
607608
label: `Scout: [ ${group} / ${title} ] plugin`,

‎.buildkite/pipelines/chrome_forward_testing.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ steps:
6464
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
6565
label: 'Scout Test Run Builder'
6666
agents:
67-
machineType: n2-standard-2
67+
machineType: n2-standard-4
68+
key: build_scout_tests
6869
timeout_in_minutes: 10
6970
depends_on:
7071
- build

‎.buildkite/pipelines/es_snapshots/verify.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ steps:
6262
image: family/kibana-ubuntu-2404
6363
imageProject: elastic-images-prod
6464
provider: gcp
65-
machineType: n2-standard-2
65+
machineType: n2-standard-4
66+
key: build_scout_tests
6667
timeout_in_minutes: 10
6768
depends_on:
68-
- build
69+
- build
6970
env:
7071
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
7172
retry:

‎.buildkite/pipelines/fleet/package_registry.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ steps:
5252
image: family/kibana-ubuntu-2404
5353
imageProject: elastic-images-prod
5454
provider: gcp
55-
machineType: n2-standard-2
55+
machineType: n2-standard-4
56+
key: build_scout_tests
5657
timeout_in_minutes: 10
5758
depends_on:
5859
- build

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,9 @@ steps:
184184
image: family/kibana-ubuntu-2404
185185
imageProject: elastic-images-prod
186186
provider: gcp
187-
machineType: n2-standard-2
187+
machineType: n2-standard-4
188188
diskSizeGb: 85
189+
key: build_scout_tests
189190
timeout_in_minutes: 10
190191
depends_on:
191192
- build

‎.buildkite/pipelines/pointer_compression.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ steps:
5757
image: family/kibana-ubuntu-2404
5858
imageProject: elastic-images-prod
5959
provider: gcp
60-
machineType: n2-standard-2
60+
machineType: n2-standard-4
61+
key: build_scout_tests
6162
timeout_in_minutes: 10
6263
depends_on:
6364
- build

‎.buildkite/pipelines/pull_request/scout_tests.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ steps:
22
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
33
label: 'Scout Test Run Builder'
44
agents:
5-
machineType: n2-standard-2
5+
machineType: n2-standard-4
6+
key: build_scout_tests
67
timeout_in_minutes: 10
78
depends_on:
89
- build
10+
- quick_checks
11+
- checks
12+
- linting
13+
- linting_with_types
14+
- check_types
15+
- check_oas_snapshot
916
env:
1017
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
1118
retry:

‎.buildkite/pull_requests.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"enabled": true,
111111
"allow_org_users": true,
112112
"allowed_repo_permissions": ["admin", "write"],
113-
"allowed_list": ["elastic-vault-github-plugin-prod[bot]", "elastic-renovate-prod[bot]"],
113+
"allowed_list": ["elastic-vault-github-plugin-prod[bot]"],
114114
"build_on_commit": true,
115115
"build_on_comment": true,
116116
"build_drafts": false,

‎.buildkite/scripts/common/setup_executors.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
# Executor-related setup
5+
6+
echo '--- Executor Setup'
7+
8+
# if FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE is set,
9+
# we should clear previously cached EPR images,
10+
# (as the package registry image is quite big to keep 2 versions of)
11+
DEFAULT_FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE='docker.elastic.co/kibana-ci/package-registry-distribution:lite'
12+
13+
# Test docker is available
14+
if [[ `command -v docker` \
15+
&& -n "${FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE:-}" \
16+
&& "${FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE}" != "${DEFAULT_FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE}" \
17+
]]; then
18+
echo 'Clearing previously cached EPR images'
19+
EPR_IMAGES=$(docker images -q "${DEFAULT_FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE}")
20+
if [[ -n "${EPR_IMAGES}" ]]; then
21+
docker rmi -f "${EPR_IMAGES}"
22+
echo "Cleared ${EPR_IMAGES} EPR images"
23+
fi
24+
fi

0 commit comments

Comments
 (0)