Skip to content

Commit caae826

Browse files
[9.2] [CI] Use alternative place to inject env variable (#243371) (#244085)
# Backport This will backport the following commits from `main` to `9.2`: - [[CI] Use alternative place to inject env variable (#243371)](#243371) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Coen Warmer","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-11-25T06:35:49Z","message":"[CI] Use alternative place to inject env variable (#243371)\n\n## Summary\n\nWe introduced adding an env variable in [this\nPR](#243191) that allows us to\ndifferentiate CI runs with the new pipeline configuration from the old\none.\n\nAdding an env variable on the pipeline level is not possible as the\n[kibana-pr.yml](https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pr.yml)\nis defined statically in yml, and the new pipeline config is the result\nof a Github tag.\n\nThis PR instead adds the env variable to all jobs that are part of the\nnew config, which we know do get shipped to the Buildkite Stats cluster.\n\nI am not aware of a way to add the env variable on the pipeline\ndefinition yaml. If this is possible, please let me know and I'll\nupdate.","sha":"f8c2301811934e90f9bc50271dd171e6b678521a","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v8.16.0","backport:version","v9.2.0","v9.3.0","ci:beta-faster-pr-build"],"title":"[CI] Use alternative place to inject env variable","number":243371,"url":"https://github.com/elastic/kibana/pull/243371","mergeCommit":{"message":"[CI] Use alternative place to inject env variable (#243371)\n\n## Summary\n\nWe introduced adding an env variable in [this\nPR](#243191) that allows us to\ndifferentiate CI runs with the new pipeline configuration from the old\none.\n\nAdding an env variable on the pipeline level is not possible as the\n[kibana-pr.yml](https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pr.yml)\nis defined statically in yml, and the new pipeline config is the result\nof a Github tag.\n\nThis PR instead adds the env variable to all jobs that are part of the\nnew config, which we know do get shipped to the Buildkite Stats cluster.\n\nI am not aware of a way to add the env variable on the pipeline\ndefinition yaml. If this is possible, please let me know and I'll\nupdate.","sha":"f8c2301811934e90f9bc50271dd171e6b678521a"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","9.2"],"targetPullRequestStates":[{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.2","label":"v9.2.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/243371","number":243371,"mergeCommit":{"message":"[CI] Use alternative place to inject env variable (#243371)\n\n## Summary\n\nWe introduced adding an env variable in [this\nPR](#243191) that allows us to\ndifferentiate CI runs with the new pipeline configuration from the old\none.\n\nAdding an env variable on the pipeline level is not possible as the\n[kibana-pr.yml](https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pr.yml)\nis defined statically in yml, and the new pipeline config is the result\nof a Github tag.\n\nThis PR instead adds the env variable to all jobs that are part of the\nnew config, which we know do get shipped to the Buildkite Stats cluster.\n\nI am not aware of a way to add the env variable on the pipeline\ndefinition yaml. If this is possible, please let me know and I'll\nupdate.","sha":"f8c2301811934e90f9bc50271dd171e6b678521a"}}]}] BACKPORT--> Co-authored-by: Coen Warmer <[email protected]>
1 parent 7ddceeb commit caae826

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

.buildkite/pipelines/pull_request/base_merged_phases.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
env:
2-
KIBANA_CI_MERGED_PHASES: 'true'
3-
41
steps:
52
- command: .buildkite/scripts/steps/build_kibana.sh
63
label: Build Kibana Distribution
@@ -10,6 +7,8 @@ steps:
107
key: build
118
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
129
timeout_in_minutes: 90
10+
env:
11+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
1312
retry:
1413
automatic:
1514
- exit_status: '-1'
@@ -23,6 +22,8 @@ steps:
2322
diskSizeGb: 115
2423
key: quick_checks
2524
timeout_in_minutes: 60
25+
env:
26+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
2627
retry:
2728
automatic:
2829
- exit_status: '-1'
@@ -36,6 +37,8 @@ steps:
3637
preemptible: true
3738
diskSizeGb: 115
3839
timeout_in_minutes: 60
40+
env:
41+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
3942
retry:
4043
automatic:
4144
- exit_status: '-1'
@@ -49,6 +52,8 @@ steps:
4952
diskSizeGb: 115
5053
key: linting
5154
timeout_in_minutes: 60
55+
env:
56+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
5257
retry:
5358
automatic:
5459
- exit_status: '-1'
@@ -62,6 +67,8 @@ steps:
6267
diskSizeGb: 115
6368
key: linting_with_types
6469
timeout_in_minutes: 60
70+
env:
71+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
6572
retry:
6673
automatic:
6774
- exit_status: '-1'
@@ -74,6 +81,8 @@ steps:
7481
preemptible: true
7582
key: check_oas_snapshot
7683
timeout_in_minutes: 60
84+
env:
85+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
7786
retry:
7887
automatic:
7988
- exit_status: '-1'
@@ -89,6 +98,8 @@ steps:
8998
diskSizeGb: 115
9099
key: check_types
91100
timeout_in_minutes: 60
101+
env:
102+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
92103
retry:
93104
automatic:
94105
- exit_status: '-1'
@@ -106,6 +117,7 @@ steps:
106117
JEST_CONFIGS_DEPS: 'check_types'
107118
FTR_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/ftr_configs.sh'
108119
FTR_CONFIGS_DEPS: 'build,check_types'
120+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
109121
retry:
110122
automatic:
111123
- exit_status: '*'
@@ -117,6 +129,8 @@ steps:
117129
machineType: n2-standard-2
118130
diskSizeGb: 115
119131
timeout_in_minutes: 10
132+
env:
133+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
120134
depends_on:
121135
- build
122136
- build_api_docs
@@ -140,6 +154,8 @@ steps:
140154
- quick_checks
141155
- check_oas_snapshot
142156
timeout_in_minutes: 90
157+
env:
158+
KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
143159
retry:
144160
automatic:
145161
- exit_status: '-1'

0 commit comments

Comments
 (0)