Skip to content

Commit fa8ef62

Browse files
prdoyleprdoyle
authored
Merge branch '9.0' into backport/9.0/pr-134578
2 parents 7557ef9 + 71d54f4 commit fa8ef62

File tree

329 files changed

+5907
-1995
lines changed

Some content is hidden

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

329 files changed

+5907
-1995
lines changed

‎.backportrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"targetBranchChoices" : [ "main", "9.0", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v9.0.7$" : "main",
6+
"^v9.0.9$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ steps:
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
59-
BWC_VERSION: ["8.18.7", "9.0.7"]
59+
BWC_VERSION: ["8.18.9", "9.0.9"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-fwc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: ["9.0.0", "9.0.1", "9.0.2", "9.0.3", "9.0.4", "9.0.5", "9.0.6"]
13+
FWC_VERSION: ["9.0.0", "9.0.1", "9.0.2", "9.0.3", "9.0.4", "9.0.5", "9.0.6", "9.0.7", "9.0.8"]
1414
env:
1515
FWC_VERSION: "{{matrix.FWC_VERSION}}"

‎.buildkite/pipelines/periodic-java-ea.template.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
env:
2-
JAVA_EA_VERSION: "${JAVA_EA_VERSION:-25-pre}"
2+
JAVA_EA_VERSION: "${JAVA_EA_VERSION:-26-pre}"
33

44
steps:
55
- group: bwc

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 8 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is auto-generated. See .buildkite/pipelines/periodic-java-ea.template.yml
22
env:
3-
JAVA_EA_VERSION: "${JAVA_EA_VERSION:-25-pre}"
3+
JAVA_EA_VERSION: "${JAVA_EA_VERSION:-26-pre}"
44

55
steps:
66
- group: bwc
@@ -347,8 +347,8 @@ steps:
347347
- signal_reason: agent_stop
348348
limit: 3
349349

350-
- label: 8.18.7 / bwc
351-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.7#bwcTest
350+
- label: 8.18.9 / bwc
351+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.9#bwcTest
352352
timeout_in_minutes: 300
353353
agents:
354354
provider: gcp
@@ -357,7 +357,7 @@ steps:
357357
buildDirectory: /dev/shm/bk
358358
preemptible: true
359359
env:
360-
BWC_VERSION: 8.18.7
360+
BWC_VERSION: 8.18.9
361361
retry:
362362
automatic:
363363
- exit_status: "-1"
@@ -366,8 +366,8 @@ steps:
366366
- signal_reason: agent_stop
367367
limit: 3
368368

369-
- label: 8.19.4 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.4#bwcTest
369+
- label: 9.0.9 / bwc
370+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.9#bwcTest
371371
timeout_in_minutes: 300
372372
agents:
373373
provider: gcp
@@ -376,64 +376,7 @@ steps:
376376
buildDirectory: /dev/shm/bk
377377
preemptible: true
378378
env:
379-
BWC_VERSION: 8.19.4
380-
retry:
381-
automatic:
382-
- exit_status: "-1"
383-
limit: 3
384-
signal_reason: none
385-
- signal_reason: agent_stop
386-
limit: 3
387-
388-
- label: 9.0.7 / bwc
389-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.7#bwcTest
390-
timeout_in_minutes: 300
391-
agents:
392-
provider: gcp
393-
image: family/elasticsearch-ubuntu-2404
394-
machineType: n1-standard-32
395-
buildDirectory: /dev/shm/bk
396-
preemptible: true
397-
env:
398-
BWC_VERSION: 9.0.7
399-
retry:
400-
automatic:
401-
- exit_status: "-1"
402-
limit: 3
403-
signal_reason: none
404-
- signal_reason: agent_stop
405-
limit: 3
406-
407-
- label: 9.1.4 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.4#bwcTest
409-
timeout_in_minutes: 300
410-
agents:
411-
provider: gcp
412-
image: family/elasticsearch-ubuntu-2404
413-
machineType: n1-standard-32
414-
buildDirectory: /dev/shm/bk
415-
preemptible: true
416-
env:
417-
BWC_VERSION: 9.1.4
418-
retry:
419-
automatic:
420-
- exit_status: "-1"
421-
limit: 3
422-
signal_reason: none
423-
- signal_reason: agent_stop
424-
limit: 3
425-
426-
- label: 9.2.0 / bwc
427-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.0#bwcTest
428-
timeout_in_minutes: 300
429-
agents:
430-
provider: gcp
431-
image: family/elasticsearch-ubuntu-2404
432-
machineType: n1-standard-32
433-
buildDirectory: /dev/shm/bk
434-
preemptible: true
435-
env:
436-
BWC_VERSION: 9.2.0
379+
BWC_VERSION: 9.0.9
437380
retry:
438381
automatic:
439382
- exit_status: "-1"
@@ -496,7 +439,7 @@ steps:
496439
timeout_in_minutes: 300
497440
matrix:
498441
setup:
499-
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.7", "9.1.4", "9.2.0"]
442+
BWC_VERSION: ["8.18.9", "9.0.9"]
500443
agents:
501444
provider: gcp
502445
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ steps:
318318
env:
319319
BWC_VERSION: 8.17.10
320320

321-
- label: "{{matrix.image}} / 8.18.7 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.7
321+
- label: "{{matrix.image}} / 8.18.9 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.9
323323
timeout_in_minutes: 300
324324
matrix:
325325
setup:
@@ -332,10 +332,10 @@ steps:
332332
machineType: custom-16-32768
333333
buildDirectory: /dev/shm/bk
334334
env:
335-
BWC_VERSION: 8.18.7
335+
BWC_VERSION: 8.18.9
336336

337-
- label: "{{matrix.image}} / 9.0.7 / packaging-tests-upgrade"
338-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.7
337+
- label: "{{matrix.image}} / 9.0.9 / packaging-tests-upgrade"
338+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.9
339339
timeout_in_minutes: 300
340340
matrix:
341341
setup:
@@ -348,7 +348,7 @@ steps:
348348
machineType: custom-16-32768
349349
buildDirectory: /dev/shm/bk
350350
env:
351-
BWC_VERSION: 9.0.7
351+
BWC_VERSION: 9.0.9
352352

353353
- group: packaging-tests-windows
354354
steps:

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.7 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.7#bwcTest
347+
- label: 8.18.9 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.9#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.7
357+
BWC_VERSION: 8.18.9
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -363,8 +363,8 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 9.0.7 / bwc
367-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.7#bwcTest
366+
- label: 9.0.9 / bwc
367+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.9#bwcTest
368368
timeout_in_minutes: 300
369369
agents:
370370
provider: gcp
@@ -373,7 +373,7 @@ steps:
373373
buildDirectory: /dev/shm/bk
374374
preemptible: true
375375
env:
376-
BWC_VERSION: 9.0.7
376+
BWC_VERSION: 9.0.9
377377
retry:
378378
automatic:
379379
- exit_status: "-1"
@@ -448,7 +448,7 @@ steps:
448448
setup:
449449
ES_RUNTIME_JAVA:
450450
- openjdk21
451-
BWC_VERSION: ["8.18.7", "9.0.7"]
451+
BWC_VERSION: ["8.18.9", "9.0.9"]
452452
agents:
453453
provider: gcp
454454
image: family/elasticsearch-ubuntu-2404
@@ -490,7 +490,7 @@ steps:
490490
ES_RUNTIME_JAVA:
491491
- openjdk21
492492
- openjdk23
493-
BWC_VERSION: ["8.18.7", "9.0.7"]
493+
BWC_VERSION: ["8.18.9", "9.0.9"]
494494
agents:
495495
provider: gcp
496496
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/pull-request/pr-upgrade.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ steps:
22
- label: pr-upgrade
33
command: ".buildkite/scripts/run-pr-upgrade-tests.sh"
44
agents:
5-
image: "docker.elastic.co/ci-agent-images/eck-region/buildkite-agent:1.5"
5+
image: "docker.elastic.co/ci-agent-images/eck-region/buildkite-agent:1.15"
66
memory: "4G"

‎.buildkite/pipelines/pull-request/validate-transport-version-backport.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
config:
2+
skip-target-branches: "main"
3+
steps:
4+
- label: validate-transport-version-backport
5+
command: .buildkite/scripts/validate-transport-version-backport.sh

‎.buildkite/scripts/pull-request/__snapshots__/pipeline.test.ts.snap‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,68 @@ exports[`generatePipelines should generate correct pipelines with a non-docs cha
309309
},
310310
]
311311
`;
312+
313+
exports[`generatePipelines should generate correct pipelines with a different branch that is not skipped 1`] = `
314+
[
315+
{
316+
"name": "bwc-snapshots",
317+
"pipeline": {
318+
"steps": [
319+
{
320+
"group": "bwc-snapshots",
321+
"steps": [
322+
{
323+
"agents": {
324+
"buildDirectory": "/dev/shm/bk",
325+
"image": "family/elasticsearch-ubuntu-2404",
326+
"machineType": "custom-32-98304",
327+
"provider": "gcp",
328+
},
329+
"command": ".ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTest",
330+
"env": {
331+
"BWC_VERSION": "{{matrix.BWC_VERSION}}",
332+
},
333+
"label": "{{matrix.BWC_VERSION}} / bwc-snapshots",
334+
"matrix": {
335+
"setup": {
336+
"BWC_VERSION": [
337+
"7.17.14",
338+
"8.10.3",
339+
"8.11.0",
340+
],
341+
},
342+
},
343+
"timeout_in_minutes": 300,
344+
},
345+
],
346+
},
347+
],
348+
},
349+
},
350+
{
351+
"name": "skip-branch",
352+
"pipeline": {
353+
"steps": [
354+
{
355+
"command": "echo 1",
356+
"label": "skip-me",
357+
},
358+
],
359+
},
360+
},
361+
{
362+
"name": "using-defaults",
363+
"pipeline": {
364+
"env": {
365+
"CUSTOM_ENV_VAR": "value",
366+
},
367+
"steps": [
368+
{
369+
"command": "echo 'hello world'",
370+
"label": "test-step",
371+
},
372+
],
373+
},
374+
},
375+
]
376+
`;

0 commit comments

Comments
 (0)