Skip to content

Commit d1db65b

Browse files
georgewallacegeorgewallace
authored
Merge branch '8.17' into 8.17
2 parents 40deca3 + 1a3e3f1 commit d1db65b

File tree

493 files changed

+10170
-3494
lines changed

Some content is hidden

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

493 files changed

+10170
-3494
lines changed

‎.backportrc.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "8.x", "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" ],
3+
"targetBranchChoices" : [ "main", "8.x", "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.0$" : "main",
7-
"^v8.17.1$" : "8.x",
6+
"^v9.1.0$" : "main",
7+
"^v8.17.3$" : "8.x",
88
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
99
}
1010
}

‎.buildkite/hooks/pre-command‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ export GRADLE_BUILD_CACHE_USERNAME
4444
GRADLE_BUILD_CACHE_PASSWORD=$(vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)
4545
export GRADLE_BUILD_CACHE_PASSWORD
4646

47+
DEVELOCITY_ACCESS_KEY="gradle-enterprise.elastic.co=$(vault read -field=accesskey secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)"
48+
export DEVELOCITY_ACCESS_KEY
49+
4750
BUILDKITE_API_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/buildkite-api-token)
4851
export BUILDKITE_API_TOKEN
4952

‎.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: ["7.17.27", "8.16.3", "8.17.1"]
59+
BWC_VERSION: ["7.17.29", "8.16.5", "8.17.3"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
steps:
2+
- label: {{matrix.FWC_VERSION}} / fwc
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
4+
timeout_in_minutes: 300
5+
agents:
6+
provider: gcp
7+
image: family/elasticsearch-ubuntu-2004
8+
machineType: n1-standard-32
9+
buildDirectory: /dev/shm/bk
10+
matrix:
11+
setup:
12+
FWC_VERSION: $FWC_LIST
13+
env:
14+
FWC_VERSION: {{matrix.FWC_VERSION}}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file is auto-generated. See .buildkite/pipelines/periodic-fwc.template.yml
2+
steps:
3+
- label: {{matrix.FWC_VERSION}} / fwc
4+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
5+
timeout_in_minutes: 300
6+
agents:
7+
provider: gcp
8+
image: family/elasticsearch-ubuntu-2004
9+
machineType: n1-standard-32
10+
buildDirectory: /dev/shm/bk
11+
matrix:
12+
setup:
13+
FWC_VERSION: ["8.17.0", "8.17.1", "8.17.2"]
14+
env:
15+
FWC_VERSION: {{matrix.FWC_VERSION}}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ steps:
4040
matrix:
4141
setup:
4242
image:
43-
- windows-2016
4443
- windows-2019
4544
- windows-2022
4645
agents:

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ steps:
304304
env:
305305
BWC_VERSION: 7.16.3
306306

307-
- label: "{{matrix.image}} / 7.17.27 / packaging-tests-upgrade"
308-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.27
307+
- label: "{{matrix.image}} / 7.17.29 / packaging-tests-upgrade"
308+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.29
309309
timeout_in_minutes: 300
310310
matrix:
311311
setup:
@@ -318,7 +318,7 @@ steps:
318318
machineType: custom-16-32768
319319
buildDirectory: /dev/shm/bk
320320
env:
321-
BWC_VERSION: 7.17.27
321+
BWC_VERSION: 7.17.29
322322

323323
- label: "{{matrix.image}} / 8.0.1 / packaging-tests-upgrade"
324324
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.1
@@ -576,8 +576,8 @@ steps:
576576
env:
577577
BWC_VERSION: 8.15.5
578578

579-
- label: "{{matrix.image}} / 8.16.3 / packaging-tests-upgrade"
580-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.3
579+
- label: "{{matrix.image}} / 8.16.5 / packaging-tests-upgrade"
580+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.5
581581
timeout_in_minutes: 300
582582
matrix:
583583
setup:
@@ -590,10 +590,10 @@ steps:
590590
machineType: custom-16-32768
591591
buildDirectory: /dev/shm/bk
592592
env:
593-
BWC_VERSION: 8.16.3
593+
BWC_VERSION: 8.16.5
594594

595-
- label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
596-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1
595+
- label: "{{matrix.image}} / 8.17.3 / packaging-tests-upgrade"
596+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.3
597597
timeout_in_minutes: 300
598598
matrix:
599599
setup:
@@ -606,7 +606,7 @@ steps:
606606
machineType: custom-16-32768
607607
buildDirectory: /dev/shm/bk
608608
env:
609-
BWC_VERSION: 8.17.1
609+
BWC_VERSION: 8.17.3
610610

611611
- group: packaging-tests-windows
612612
steps:
@@ -617,7 +617,6 @@ steps:
617617
matrix:
618618
setup:
619619
image:
620-
- windows-2016
621620
- windows-2019
622621
- windows-2022
623622
agents:

‎.buildkite/pipelines/periodic-platform-support.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ steps:
3939
matrix:
4040
setup:
4141
image:
42-
- windows-2016
4342
- windows-2019
4443
- windows-2022
4544
GRADLE_TASK:

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ steps:
325325
- signal_reason: agent_stop
326326
limit: 3
327327

328-
- label: 7.17.27 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.27#bwcTest
328+
- label: 7.17.29 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.29#bwcTest
330330
timeout_in_minutes: 300
331331
agents:
332332
provider: gcp
@@ -335,7 +335,7 @@ steps:
335335
buildDirectory: /dev/shm/bk
336336
preemptible: true
337337
env:
338-
BWC_VERSION: 7.17.27
338+
BWC_VERSION: 7.17.29
339339
retry:
340340
automatic:
341341
- exit_status: "-1"
@@ -648,8 +648,8 @@ steps:
648648
- signal_reason: agent_stop
649649
limit: 3
650650

651-
- label: 8.16.3 / bwc
652-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.3#bwcTest
651+
- label: 8.16.5 / bwc
652+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.5#bwcTest
653653
timeout_in_minutes: 300
654654
agents:
655655
provider: gcp
@@ -658,7 +658,7 @@ steps:
658658
buildDirectory: /dev/shm/bk
659659
preemptible: true
660660
env:
661-
BWC_VERSION: 8.16.3
661+
BWC_VERSION: 8.16.5
662662
retry:
663663
automatic:
664664
- exit_status: "-1"
@@ -667,8 +667,8 @@ steps:
667667
- signal_reason: agent_stop
668668
limit: 3
669669

670-
- label: 8.17.1 / bwc
671-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.1#bwcTest
670+
- label: 8.17.3 / bwc
671+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.3#bwcTest
672672
timeout_in_minutes: 300
673673
agents:
674674
provider: gcp
@@ -677,7 +677,7 @@ steps:
677677
buildDirectory: /dev/shm/bk
678678
preemptible: true
679679
env:
680-
BWC_VERSION: 8.17.1
680+
BWC_VERSION: 8.17.3
681681
retry:
682682
automatic:
683683
- exit_status: "-1"
@@ -752,7 +752,7 @@ steps:
752752
setup:
753753
ES_RUNTIME_JAVA:
754754
- openjdk17
755-
BWC_VERSION: ["7.17.27", "8.16.3", "8.17.1"]
755+
BWC_VERSION: ["7.17.29", "8.16.5", "8.17.3"]
756756
agents:
757757
provider: gcp
758758
image: family/elasticsearch-ubuntu-2004
@@ -800,7 +800,7 @@ steps:
800800
- openjdk21
801801
- openjdk22
802802
- openjdk23
803-
BWC_VERSION: ["7.17.27", "8.16.3", "8.17.1"]
803+
BWC_VERSION: ["7.17.29", "8.16.5", "8.17.3"]
804804
agents:
805805
provider: gcp
806806
image: family/elasticsearch-ubuntu-2004

‎.buildkite/pipelines/pull-request/packaging-tests-windows.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ steps:
1010
matrix:
1111
setup:
1212
image:
13-
- windows-2016
1413
- windows-2019
1514
- windows-2022
1615
PACKAGING_TASK:

0 commit comments

Comments
 (0)