Skip to content

Commit 374c88b

Browse files
kibanamachinedelanni
kibanamachine
and
delanni
authored
[9.2] Standardize disk sizes (#245624) (#245672)
# Backport This will backport the following commits from `main` to `9.2`: - [Standardize disk sizes (#245624)](#245624) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Alex Szabo","email":"alex.szabo@elastic.co"},"sourceCommit":{"committedDate":"2025-12-09T15:14:11Z","message":"Standardize disk sizes (#245624)\n\n## Summary\nIncreases disk sizes across the board for FTR and Jest integration tests\nto 105G, reduces allocated disk space from 115->105 in several other\ncases.","sha":"fbd1d84b48642fcf9da4cde3fbd24cea6cf39268","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","backport:all-open","v9.3.0"],"title":"Standardize disk sizes","number":245624,"url":"https://github.com/elastic/kibana/pull/245624","mergeCommit":{"message":"Standardize disk sizes (#245624)\n\n## Summary\nIncreases disk sizes across the board for FTR and Jest integration tests\nto 105G, reduces allocated disk space from 115->105 in several other\ncases.","sha":"fbd1d84b48642fcf9da4cde3fbd24cea6cf39268"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/245624","number":245624,"mergeCommit":{"message":"Standardize disk sizes (#245624)\n\n## Summary\nIncreases disk sizes across the board for FTR and Jest integration tests\nto 105G, reduces allocated disk space from 115->105 in several other\ncases.","sha":"fbd1d84b48642fcf9da4cde3fbd24cea6cf39268"}}]}] BACKPORT--> Co-authored-by: Alex Szabo <alex.szabo@elastic.co>
1 parent 8c27669 commit 374c88b

5 files changed

Lines changed: 23 additions & 25 deletions

File tree

‎.buildkite/pipeline-utils/agent_images.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ const DEFAULT_AGENT_IMAGE_CONFIG: BuildkiteAgentTargetingRule = {
1919
provider: 'gcp',
2020
image: 'family/kibana-ubuntu-2404',
2121
imageProject: ELASTIC_IMAGES_PROD_PROJECT,
22+
diskSizeGb: 105,
2223
};
2324

2425
const FIPS_AGENT_IMAGE_CONFIG: BuildkiteAgentTargetingRule = {
2526
provider: 'gcp',
2627
image: 'family/kibana-fips-ubuntu-2404',
2728
imageProject: ELASTIC_IMAGES_PROD_PROJECT,
29+
diskSizeGb: 105,
2830
};
2931

3032
const GITHUB_PR_LABELS = process.env.GITHUB_PR_LABELS ?? '';
@@ -61,7 +63,7 @@ function getAgentImageConfig({ returnYaml = false } = {}): string | BuildkiteAge
6163
return config;
6264
}
6365

64-
const expandAgentQueue = (queueName: string = 'n2-4-spot') => {
66+
const expandAgentQueue = (queueName: string = 'n2-4-spot', diskSizeGb?: number) => {
6567
const [kind, cores, addition] = queueName.split('-');
6668
const additionalProps =
6769
{
@@ -72,6 +74,7 @@ const expandAgentQueue = (queueName: string = 'n2-4-spot') => {
7274
return {
7375
...getAgentImageConfig(),
7476
machineType: `${kind}-standard-${cores}`,
77+
...(diskSizeGb ? { diskSizeGb } : {}),
7578
...additionalProps,
7679
};
7780
};

‎.buildkite/pipeline-utils/buildkite/client.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export interface BuildkiteAgentTargetingRule {
5151
machineType?: string;
5252
minCpuPlatform?: string;
5353
preemptible?: boolean;
54+
diskSizeGb?: number;
5455
}
5556

5657
export interface BuildkiteCommandStep {

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,7 @@ export async function pickTestGroupRunOrder() {
512512
parallelism: unit.count,
513513
timeout_in_minutes: 120,
514514
key: 'jest',
515-
agents: {
516-
...expandAgentQueue('n2-4-spot'),
517-
diskSizeGb: 115,
518-
},
515+
agents: expandAgentQueue('n2-4-spot', 110),
519516
env: {
520517
SCOUT_TARGET_TYPE: 'local',
521518
},
@@ -537,7 +534,7 @@ export async function pickTestGroupRunOrder() {
537534
parallelism: integration.count,
538535
timeout_in_minutes: 120,
539536
key: 'jest-integration',
540-
agents: expandAgentQueue('n2-4-spot'),
537+
agents: expandAgentQueue('n2-4-spot', 105),
541538
env: {
542539
SCOUT_TARGET_TYPE: 'local',
543540
},
@@ -575,7 +572,7 @@ export async function pickTestGroupRunOrder() {
575572
label: title,
576573
command: getRequiredEnv('FTR_CONFIGS_SCRIPT'),
577574
timeout_in_minutes: 120,
578-
agents: expandAgentQueue(queue),
575+
agents: expandAgentQueue(queue, 105),
579576
env: {
580577
SCOUT_TARGET_TYPE: 'local',
581578
FTR_CONFIG_GROUP_KEY: key,

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ steps:
1010
imageProject: elastic-images-prod
1111
provider: gcp
1212
machineType: n2-standard-2
13-
diskSizeGb: 115
1413
retry:
1514
automatic:
1615
- exit_status: '*'
@@ -54,7 +53,7 @@ steps:
5453
provider: gcp
5554
machineType: n2-highcpu-8
5655
preemptible: true
57-
diskSizeGb: 115
56+
diskSizeGb: 105
5857
timeout_in_minutes: 60
5958
retry:
6059
automatic:
@@ -69,7 +68,7 @@ steps:
6968
provider: gcp
7069
machineType: n2-standard-2
7170
preemptible: true
72-
diskSizeGb: 115
71+
diskSizeGb: 105
7372
timeout_in_minutes: 60
7473
retry:
7574
automatic:
@@ -84,7 +83,7 @@ steps:
8483
provider: gcp
8584
machineType: n2-standard-16
8685
preemptible: true
87-
diskSizeGb: 115
86+
diskSizeGb: 105
8887
timeout_in_minutes: 60
8988
retry:
9089
automatic:
@@ -99,7 +98,7 @@ steps:
9998
provider: gcp
10099
machineType: n2-standard-32
101100
preemptible: true
102-
diskSizeGb: 115
101+
diskSizeGb: 105
103102
timeout_in_minutes: 60
104103
retry:
105104
automatic:
@@ -116,7 +115,7 @@ steps:
116115
diskType: 'hyperdisk-balanced'
117116
preemptible: true
118117
spotZones: us-central1-a,us-central1-b,us-central1-c
119-
diskSizeGb: 115
118+
diskSizeGb: 105
120119
timeout_in_minutes: 60
121120
retry:
122121
automatic:
@@ -148,7 +147,7 @@ steps:
148147
provider: gcp
149148
machineType: n2-highmem-4
150149
preemptible: true
151-
diskSizeGb: 115
150+
diskSizeGb: 105
152151
timeout_in_minutes: 80
153152
retry:
154153
automatic:
@@ -164,7 +163,7 @@ steps:
164163
imageProject: elastic-images-prod
165164
provider: gcp
166165
machineType: n2-standard-2
167-
diskSizeGb: 115
166+
diskSizeGb: 105
168167
timeout_in_minutes: 10
169168
depends_on:
170169
- build
@@ -181,7 +180,7 @@ steps:
181180
imageProject: elastic-images-prod
182181
provider: gcp
183182
machineType: n2-standard-2
184-
diskSizeGb: 115
183+
diskSizeGb: 105
185184
timeout_in_minutes: 10
186185
env:
187186
JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'
@@ -199,7 +198,7 @@ steps:
199198
imageProject: elastic-images-prod
200199
provider: gcp
201200
machineType: n2-standard-4
202-
diskSizeGb: 115
201+
diskSizeGb: 105
203202
key: build_scout_tests
204203
timeout_in_minutes: 10
205204
depends_on:

‎.buildkite/pipelines/pull_request/base.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ steps:
55
id: pre_build
66
agents:
77
machineType: n2-standard-2
8-
diskSizeGb: 115
98

109
- wait
1110

@@ -39,7 +38,7 @@ steps:
3938
agents:
4039
machineType: n2-highcpu-8
4140
preemptible: true
42-
diskSizeGb: 115
41+
diskSizeGb: 105
4342
key: quick_checks
4443
timeout_in_minutes: 60
4544
retry:
@@ -53,7 +52,7 @@ steps:
5352
agents:
5453
machineType: n2-standard-2
5554
preemptible: true
56-
diskSizeGb: 115
55+
diskSizeGb: 105
5756
timeout_in_minutes: 60
5857
retry:
5958
automatic:
@@ -65,7 +64,7 @@ steps:
6564
agents:
6665
machineType: n2-standard-16
6766
preemptible: true
68-
diskSizeGb: 115
67+
diskSizeGb: 105
6968
key: linting
7069
timeout_in_minutes: 60
7170
retry:
@@ -78,7 +77,7 @@ steps:
7877
agents:
7978
machineType: n2-standard-32
8079
preemptible: true
81-
diskSizeGb: 115
80+
diskSizeGb: 105
8281
key: linting_with_types
8382
timeout_in_minutes: 60
8483
retry:
@@ -105,7 +104,7 @@ steps:
105104
diskType: 'hyperdisk-balanced'
106105
preemptible: true
107106
spotZones: us-central1-a,us-central1-b,us-central1-c
108-
diskSizeGb: 115
107+
diskSizeGb: 105
109108
key: check_types
110109
timeout_in_minutes: 60
111110
retry:
@@ -119,7 +118,6 @@ steps:
119118
label: Mark CI Stats as ready
120119
agents:
121120
machineType: n2-standard-2
122-
diskSizeGb: 115
123121
timeout_in_minutes: 10
124122
depends_on:
125123
- build
@@ -134,7 +132,7 @@ steps:
134132
agents:
135133
machineType: n2-highmem-4
136134
preemptible: true
137-
diskSizeGb: 115
135+
diskSizeGb: 105
138136
key: build_api_docs
139137
timeout_in_minutes: 90
140138
retry:

0 commit comments

Comments
 (0)