Skip to content

Commit b317942

Browse files
jonathan-buttnerjonathan-buttner
committed
Merge branch '8.x' of github.com:elastic/elasticsearch into backport/8.x/pr-117589
2 parents 952953a + 7846d8d commit b317942

File tree

536 files changed

+16100
-6925
lines changed

Some content is hidden

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

536 files changed

+16100
-6925
lines changed

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,20 @@ steps:
1212
- opensuse-leap-15
1313
- oraclelinux-7
1414
- oraclelinux-8
15+
- oraclelinux-9
1516
- sles-12
1617
- sles-15
1718
- ubuntu-1804
1819
- ubuntu-2004
1920
- ubuntu-2204
21+
- ubuntu-2404
2022
- rocky-8
2123
- rocky-9
2224
- rhel-7
2325
- rhel-8
2426
- rhel-9
2527
- almalinux-8
28+
- almalinux-9
2629
agents:
2730
provider: gcp
2831
image: family/elasticsearch-{{matrix.image}}

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,20 @@ steps:
1313
- opensuse-leap-15
1414
- oraclelinux-7
1515
- oraclelinux-8
16+
- oraclelinux-9
1617
- sles-12
1718
- sles-15
1819
- ubuntu-1804
1920
- ubuntu-2004
2021
- ubuntu-2204
22+
- ubuntu-2404
2123
- rocky-8
2224
- rocky-9
2325
- rhel-7
2426
- rhel-8
2527
- rhel-9
2628
- almalinux-8
29+
- almalinux-9
2730
agents:
2831
provider: gcp
2932
image: family/elasticsearch-{{matrix.image}}
@@ -560,8 +563,8 @@ steps:
560563
env:
561564
BWC_VERSION: 8.14.3
562565

563-
- label: "{{matrix.image}} / 8.15.6 / packaging-tests-upgrade"
564-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.6
566+
- label: "{{matrix.image}} / 8.15.5 / packaging-tests-upgrade"
567+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.5
565568
timeout_in_minutes: 300
566569
matrix:
567570
setup:
@@ -574,7 +577,7 @@ steps:
574577
machineType: custom-16-32768
575578
buildDirectory: /dev/shm/bk
576579
env:
577-
BWC_VERSION: 8.15.6
580+
BWC_VERSION: 8.15.5
578581

579582
- label: "{{matrix.image}} / 8.16.2 / packaging-tests-upgrade"
580583
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.2
@@ -592,8 +595,8 @@ steps:
592595
env:
593596
BWC_VERSION: 8.16.2
594597

595-
- label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
596-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0
598+
- label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
599+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1
597600
timeout_in_minutes: 300
598601
matrix:
599602
setup:
@@ -606,7 +609,7 @@ steps:
606609
machineType: custom-16-32768
607610
buildDirectory: /dev/shm/bk
608611
env:
609-
BWC_VERSION: 8.17.0
612+
BWC_VERSION: 8.17.1
610613

611614
- label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
612615
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,20 @@ steps:
1212
- opensuse-leap-15
1313
- oraclelinux-7
1414
- oraclelinux-8
15+
- oraclelinux-9
1516
- sles-12
1617
- sles-15
1718
- ubuntu-1804
1819
- ubuntu-2004
1920
- ubuntu-2204
21+
- ubuntu-2404
2022
- rocky-8
2123
- rocky-9
2224
- rhel-7
2325
- rhel-8
2426
- rhel-9
2527
- almalinux-8
28+
- almalinux-9
2629
agents:
2730
provider: gcp
2831
image: family/elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -629,8 +629,8 @@ steps:
629629
- signal_reason: agent_stop
630630
limit: 3
631631

632-
- label: 8.15.6 / bwc
633-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.6#bwcTest
632+
- label: 8.15.5 / bwc
633+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.5#bwcTest
634634
timeout_in_minutes: 300
635635
agents:
636636
provider: gcp
@@ -639,7 +639,7 @@ steps:
639639
buildDirectory: /dev/shm/bk
640640
preemptible: true
641641
env:
642-
BWC_VERSION: 8.15.6
642+
BWC_VERSION: 8.15.5
643643
retry:
644644
automatic:
645645
- exit_status: "-1"
@@ -667,8 +667,8 @@ steps:
667667
- signal_reason: agent_stop
668668
limit: 3
669669

670-
- label: 8.17.0 / bwc
671-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.0#bwcTest
670+
- label: 8.17.1 / bwc
671+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.1#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.0
680+
BWC_VERSION: 8.17.1
681681
retry:
682682
automatic:
683683
- exit_status: "-1"
@@ -771,7 +771,7 @@ steps:
771771
setup:
772772
ES_RUNTIME_JAVA:
773773
- openjdk17
774-
BWC_VERSION: ["7.17.27", "8.15.6", "8.16.2", "8.17.0", "8.18.0"]
774+
BWC_VERSION: ["7.17.27", "8.16.2", "8.17.1", "8.18.0"]
775775
agents:
776776
provider: gcp
777777
image: family/elasticsearch-ubuntu-2004
@@ -819,7 +819,7 @@ steps:
819819
- openjdk21
820820
- openjdk22
821821
- openjdk23
822-
BWC_VERSION: ["7.17.27", "8.15.6", "8.16.2", "8.17.0", "8.18.0"]
822+
BWC_VERSION: ["7.17.27", "8.16.2", "8.17.1", "8.18.0"]
823823
agents:
824824
provider: gcp
825825
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 10 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,65 +3,9 @@ config:
33
steps:
44
- group: packaging-tests-unix
55
steps:
6-
- label: "{{matrix.image}} / docker / packaging-tests-unix"
7-
key: "packaging-tests-unix-docker"
8-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.docker-cloud-ess
9-
timeout_in_minutes: 300
10-
matrix:
11-
setup:
12-
image:
13-
- debian-11
14-
- debian-12
15-
- opensuse-leap-15
16-
- oraclelinux-7
17-
- oraclelinux-8
18-
- sles-12
19-
- sles-15
20-
- ubuntu-1804
21-
- ubuntu-2004
22-
- ubuntu-2204
23-
- rocky-8
24-
- rocky-9
25-
- rhel-7
26-
- rhel-8
27-
- rhel-9
28-
- almalinux-8
29-
agents:
30-
provider: gcp
31-
image: family/elasticsearch-{{matrix.image}}
32-
diskSizeGb: 350
33-
machineType: custom-16-32768
34-
- label: "{{matrix.image}} / packages / packaging-tests-unix"
35-
key: "packaging-tests-unix-packages"
36-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.packages
37-
timeout_in_minutes: 300
38-
matrix:
39-
setup:
40-
image:
41-
- debian-11
42-
- debian-12
43-
- opensuse-leap-15
44-
- oraclelinux-7
45-
- oraclelinux-8
46-
- sles-12
47-
- sles-15
48-
- ubuntu-1804
49-
- ubuntu-2004
50-
- ubuntu-2204
51-
- rocky-8
52-
- rocky-9
53-
- rhel-7
54-
- rhel-8
55-
- rhel-9
56-
- almalinux-8
57-
agents:
58-
provider: gcp
59-
image: family/elasticsearch-{{matrix.image}}
60-
diskSizeGb: 350
61-
machineType: custom-16-32768
62-
- label: "{{matrix.image}} / archives / packaging-tests-unix"
63-
key: "packaging-tests-unix-archives"
64-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.archives
6+
- label: "{{matrix.image}} / {{matrix.PACKAGING_TASK}} / packaging-tests-unix"
7+
key: "packaging-tests-unix"
8+
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.{{matrix.PACKAGING_TASK}}
659
timeout_in_minutes: 300
6610
matrix:
6711
setup:
@@ -71,17 +15,24 @@ steps:
7115
- opensuse-leap-15
7216
- oraclelinux-7
7317
- oraclelinux-8
18+
- oraclelinux-9
7419
- sles-12
7520
- sles-15
7621
- ubuntu-1804
7722
- ubuntu-2004
7823
- ubuntu-2204
24+
- ubuntu-2404
7925
- rocky-8
8026
- rocky-9
8127
- rhel-7
8228
- rhel-8
8329
- rhel-9
8430
- almalinux-8
31+
- almalinux-9
32+
PACKAGING_TASK:
33+
- docker-cloud-ess
34+
- packages
35+
- archives
8536
agents:
8637
provider: gcp
8738
image: family/elasticsearch-{{matrix.image}}

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ BWC_VERSION:
3232
- "8.12.2"
3333
- "8.13.4"
3434
- "8.14.3"
35-
- "8.15.6"
35+
- "8.15.5"
3636
- "8.16.2"
37-
- "8.17.0"
37+
- "8.17.1"
3838
- "8.18.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
BWC_VERSION:
22
- "7.17.27"
3-
- "8.15.6"
43
- "8.16.2"
5-
- "8.17.0"
4+
- "8.17.1"
65
- "8.18.0"

‎branches.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
{
1414
"branch": "8.x"
1515
},
16-
{
17-
"branch": "8.15"
18-
},
1916
{
2017
"branch": "7.17"
2118
}

‎build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.gradle.api.Project;
1818

1919
import java.io.File;
20-
import java.util.Arrays;
21-
import java.util.Map;
2220

2321
/**
2422
* This plugin configures formatting for Java source using Spotless
@@ -66,8 +64,7 @@ public void apply(Project project) {
6664
java.importOrderFile(new File(elasticsearchWorkspace, importOrderPath));
6765

6866
// Most formatting is done through the Eclipse formatter
69-
java.eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/"))
70-
.configFile(new File(elasticsearchWorkspace, formatterConfigPath));
67+
java.eclipse().configFile(new File(elasticsearchWorkspace, formatterConfigPath));
7168

7269
// Ensure blank lines are actually empty. Since formatters are applied in
7370
// order, apply this one last, otherwise non-empty blank lines can creep

0 commit comments

Comments
 (0)