Skip to content

Commit e1457a3

Browse files
parkertimminsparkertimmins
committed
Merge branch 'main' into parker/flattened-scalar-object-mismatch
2 parents 8ff8b82 + d9b34d4 commit e1457a3

File tree

330 files changed

+9664
-4305
lines changed

Some content is hidden

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

330 files changed

+9664
-4305
lines changed

‎.buildkite/pipelines/ecs-dynamic-template-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 420
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
diskSizeGb: 350
99
machineType: custom-32-98304
1010
notify:

‎.buildkite/pipelines/intake.template.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
machineType: custom-32-98304
99
buildDirectory: /dev/shm/bk
1010
- wait
@@ -13,39 +13,39 @@ steps:
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
16-
image: family/elasticsearch-ubuntu-2004
16+
image: family/elasticsearch-ubuntu-2404
1717
machineType: n1-standard-32
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
2020
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
24-
image: family/elasticsearch-ubuntu-2004
24+
image: family/elasticsearch-ubuntu-2404
2525
machineType: n1-standard-32
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
2828
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
2929
timeout_in_minutes: 300
3030
agents:
3131
provider: gcp
32-
image: family/elasticsearch-ubuntu-2004
32+
image: family/elasticsearch-ubuntu-2404
3333
machineType: n1-standard-32
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
3636
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3737
timeout_in_minutes: 300
3838
agents:
3939
provider: gcp
40-
image: family/elasticsearch-ubuntu-2004
40+
image: family/elasticsearch-ubuntu-2404
4141
machineType: n1-standard-32
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
4444
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4545
timeout_in_minutes: 300
4646
agents:
4747
provider: gcp
48-
image: family/elasticsearch-ubuntu-2004
48+
image: family/elasticsearch-ubuntu-2404
4949
machineType: n1-standard-32
5050
buildDirectory: /dev/shm/bk
5151
- label: part6
@@ -67,7 +67,7 @@ steps:
6767
BWC_VERSION: $BWC_LIST
6868
agents:
6969
provider: gcp
70-
image: family/elasticsearch-ubuntu-2004
70+
image: family/elasticsearch-ubuntu-2404
7171
machineType: custom-32-98304
7272
buildDirectory: /dev/shm/bk
7373
env:
@@ -89,7 +89,7 @@ steps:
8989
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
9090
agents:
9191
provider: gcp
92-
image: family/elasticsearch-ubuntu-2004
92+
image: family/elasticsearch-ubuntu-2404
9393
machineType: custom-32-98304
9494
buildDirectory: /dev/shm/bk
9595
env:
@@ -100,7 +100,7 @@ steps:
100100
timeout_in_minutes: 300
101101
agents:
102102
provider: gcp
103-
image: family/elasticsearch-ubuntu-2004
103+
image: family/elasticsearch-ubuntu-2404
104104
machineType: custom-32-98304
105105
buildDirectory: /dev/shm/bk
106106
- wait

‎.buildkite/pipelines/intake.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
8-
image: family/elasticsearch-ubuntu-2004
8+
image: family/elasticsearch-ubuntu-2404
99
machineType: custom-32-98304
1010
buildDirectory: /dev/shm/bk
1111
- wait
@@ -14,39 +14,39 @@ steps:
1414
timeout_in_minutes: 300
1515
agents:
1616
provider: gcp
17-
image: family/elasticsearch-ubuntu-2004
17+
image: family/elasticsearch-ubuntu-2404
1818
machineType: n1-standard-32
1919
buildDirectory: /dev/shm/bk
2020
- label: part2
2121
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2222
timeout_in_minutes: 300
2323
agents:
2424
provider: gcp
25-
image: family/elasticsearch-ubuntu-2004
25+
image: family/elasticsearch-ubuntu-2404
2626
machineType: n1-standard-32
2727
buildDirectory: /dev/shm/bk
2828
- label: part3
2929
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
3030
timeout_in_minutes: 300
3131
agents:
3232
provider: gcp
33-
image: family/elasticsearch-ubuntu-2004
33+
image: family/elasticsearch-ubuntu-2404
3434
machineType: n1-standard-32
3535
buildDirectory: /dev/shm/bk
3636
- label: part4
3737
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3838
timeout_in_minutes: 300
3939
agents:
4040
provider: gcp
41-
image: family/elasticsearch-ubuntu-2004
41+
image: family/elasticsearch-ubuntu-2404
4242
machineType: n1-standard-32
4343
buildDirectory: /dev/shm/bk
4444
- label: part5
4545
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4646
timeout_in_minutes: 300
4747
agents:
4848
provider: gcp
49-
image: family/elasticsearch-ubuntu-2004
49+
image: family/elasticsearch-ubuntu-2404
5050
machineType: n1-standard-32
5151
buildDirectory: /dev/shm/bk
5252
- label: part6
@@ -67,7 +67,7 @@ steps:
6767
BWC_VERSION: ["8.17.8", "8.18.3", "8.19.0", "9.0.3", "9.1.0"]
6868
agents:
6969
provider: gcp
70-
image: family/elasticsearch-ubuntu-2004
70+
image: family/elasticsearch-ubuntu-2404
7171
machineType: custom-32-98304
7272
buildDirectory: /dev/shm/bk
7373
env:
@@ -92,7 +92,7 @@ steps:
9292
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
9393
agents:
9494
provider: gcp
95-
image: family/elasticsearch-ubuntu-2004
95+
image: family/elasticsearch-ubuntu-2404
9696
machineType: custom-32-98304
9797
buildDirectory: /dev/shm/bk
9898
env:
@@ -103,7 +103,7 @@ steps:
103103
timeout_in_minutes: 300
104104
agents:
105105
provider: gcp
106-
image: family/elasticsearch-ubuntu-2004
106+
image: family/elasticsearch-ubuntu-2404
107107
machineType: custom-32-98304
108108
buildDirectory: /dev/shm/bk
109109
- wait

‎.buildkite/pipelines/lucene-snapshot/build-snapshot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
UPDATE_ES_LUCENE_SNAPSHOT: "true"
1313
agents:
1414
provider: gcp
15-
image: family/elasticsearch-ubuntu-2004
15+
image: family/elasticsearch-ubuntu-2404
1616
machineType: custom-32-98304
1717
buildDirectory: /dev/shm/bk
1818
- wait

‎.buildkite/pipelines/lucene-snapshot/run-tests.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
machineType: custom-32-98304
99
buildDirectory: /dev/shm/bk
1010
- wait: null
@@ -13,39 +13,39 @@ steps:
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
16-
image: family/elasticsearch-ubuntu-2004
16+
image: family/elasticsearch-ubuntu-2404
1717
machineType: custom-32-98304
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
2020
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
24-
image: family/elasticsearch-ubuntu-2004
24+
image: family/elasticsearch-ubuntu-2404
2525
machineType: custom-32-98304
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
2828
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
2929
timeout_in_minutes: 300
3030
agents:
3131
provider: gcp
32-
image: family/elasticsearch-ubuntu-2004
32+
image: family/elasticsearch-ubuntu-2404
3333
machineType: custom-32-98304
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
3636
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3737
timeout_in_minutes: 300
3838
agents:
3939
provider: gcp
40-
image: family/elasticsearch-ubuntu-2004
40+
image: family/elasticsearch-ubuntu-2404
4141
machineType: custom-32-98304
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
4444
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4545
timeout_in_minutes: 300
4646
agents:
4747
provider: gcp
48-
image: family/elasticsearch-ubuntu-2004
48+
image: family/elasticsearch-ubuntu-2404
4949
machineType: custom-32-98304
5050
buildDirectory: /dev/shm/bk
5151
- label: part6
@@ -68,7 +68,7 @@ steps:
6868
- 8.10.0
6969
agents:
7070
provider: gcp
71-
image: family/elasticsearch-ubuntu-2004
71+
image: family/elasticsearch-ubuntu-2404
7272
machineType: custom-32-98304
7373
buildDirectory: /dev/shm/bk
7474
env:
@@ -78,6 +78,6 @@ steps:
7878
timeout_in_minutes: 300
7979
agents:
8080
provider: gcp
81-
image: family/elasticsearch-ubuntu-2004
81+
image: family/elasticsearch-ubuntu-2404
8282
machineType: custom-32-98304
8383
buildDirectory: /dev/shm/bk

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
machineType: n1-standard-32
99
buildDirectory: /dev/shm/bk
1010
matrix:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
8-
image: family/elasticsearch-ubuntu-2004
8+
image: family/elasticsearch-ubuntu-2404
99
machineType: n1-standard-32
1010
buildDirectory: /dev/shm/bk
1111
matrix:

‎.buildkite/pipelines/periodic-micro-benchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ steps:
88
timeout_in_minutes: 300
99
agents:
1010
provider: gcp
11-
image: family/elasticsearch-ubuntu-2004
11+
image: family/elasticsearch-ubuntu-2404
1212
machineType: custom-32-98304
1313
buildDirectory: /dev/shm/bk

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
setup:
66
image:
77
- rocky-8
8-
- ubuntu-2004
8+
- ubuntu-2404
99
agents:
1010
provider: gcp
1111
image: family/elasticsearch-{{matrix.image}}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ steps:
1212
- oraclelinux-8
1313
- oraclelinux-9
1414
- sles-15
15-
- ubuntu-2004
1615
- ubuntu-2204
1716
- ubuntu-2404
1817
- rocky-8

0 commit comments

Comments
 (0)