Skip to content

Commit 788cedb

Browse files
not-napoleonnot-napoleon
committed
Merge branch 'main' into add-tsdb-type-to-es-field
 Conflicts: docs/reference/query-languages/esql/kibana/definition/functions/knn.json docs/reference/query-languages/esql/kibana/docs/functions/knn.md server/src/main/java/org/elasticsearch/TransportVersions.java
2 parents b3ea052 + a8b22df commit 788cedb

File tree

2,665 files changed

+49545
-17458
lines changed

Some content is hidden

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

2,665 files changed

+49545
-17458
lines changed

‎.backportrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "9.0", "8.19", "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" ],
3+
"targetBranchChoices" : [ "main", "9.1", "9.0", "8.19", "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.1.0$" : "main",
6+
"^v9.2.0$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.buildkite/hooks/pre-command‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ if [[ "${USE_LUCENE_SNAPSHOT_CREDS:-}" == "true" ]]; then
6464
unset data
6565
fi
6666

67+
if [[ "${USE_MAVEN_GPG:-}" == "true" ]]; then
68+
vault_path="kv/ci-shared/release-eng/team-release-secrets/es-delivery/gpg"
69+
ORG_GRADLE_PROJECT_signingKey=$(vault kv get --field="private_key" $vault_path)
70+
ORG_GRADLE_PROJECT_signingPassword=$(vault kv get --field="passphase" $vault_path)
71+
export ORG_GRADLE_PROJECT_signingKey
72+
export ORG_GRADLE_PROJECT_signingPassword
73+
fi
74+
6775
if [[ "${USE_DRA_CREDENTIALS:-}" == "true" ]]; then
6876
DRA_VAULT_ROLE_ID_SECRET=$(vault read -field=role-id secret/ci/elastic-elasticsearch/legacy-vault-credentials)
6977
export DRA_VAULT_ROLE_ID_SECRET

‎.buildkite/pipelines/dra-workflow.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ steps:
22
- command: .buildkite/scripts/dra-workflow.sh
33
env:
44
USE_DRA_CREDENTIALS: "true"
5+
USE_MAVEN_GPG: "true"
56
USE_PROD_DOCKER_CREDENTIALS: "true"
67
agents:
78
provider: gcp

‎.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: 11 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,11 +67,13 @@ 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:
7474
BWC_VERSION: "{{matrix.BWC_VERSION}}"
75+
- label: bc-upgrade
76+
command: ".buildkite/scripts/run-bc-upgrade-tests.sh"
7577
- group: lucene-compat
7678
steps:
7779
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
@@ -87,7 +89,7 @@ steps:
8789
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
8890
agents:
8991
provider: gcp
90-
image: family/elasticsearch-ubuntu-2004
92+
image: family/elasticsearch-ubuntu-2404
9193
machineType: custom-32-98304
9294
buildDirectory: /dev/shm/bk
9395
env:
@@ -98,7 +100,7 @@ steps:
98100
timeout_in_minutes: 300
99101
agents:
100102
provider: gcp
101-
image: family/elasticsearch-ubuntu-2004
103+
image: family/elasticsearch-ubuntu-2404
102104
machineType: custom-32-98304
103105
buildDirectory: /dev/shm/bk
104106
- wait

‎.buildkite/pipelines/intake.yml‎

Lines changed: 13 additions & 10 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
@@ -57,21 +57,24 @@ steps:
5757
image: family/elasticsearch-ubuntu-2004
5858
machineType: n1-standard-32
5959
buildDirectory: /dev/shm/bk
60+
6061
- group: bwc-snapshots
6162
steps:
6263
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
6364
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
6465
timeout_in_minutes: 300
6566
matrix:
6667
setup:
67-
BWC_VERSION: ["8.17.8", "8.18.3", "8.19.0", "9.0.3", "9.1.0"]
68+
BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"]
6869
agents:
6970
provider: gcp
70-
image: family/elasticsearch-ubuntu-2004
71+
image: family/elasticsearch-ubuntu-2404
7172
machineType: custom-32-98304
7273
buildDirectory: /dev/shm/bk
7374
env:
7475
BWC_VERSION: "{{matrix.BWC_VERSION}}"
76+
- label: bc-upgrade
77+
command: ".buildkite/scripts/run-bc-upgrade-tests.sh"
7578
- group: lucene-compat
7679
steps:
7780
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
@@ -87,7 +90,7 @@ steps:
8790
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
8891
agents:
8992
provider: gcp
90-
image: family/elasticsearch-ubuntu-2004
93+
image: family/elasticsearch-ubuntu-2404
9194
machineType: custom-32-98304
9295
buildDirectory: /dev/shm/bk
9396
env:
@@ -98,7 +101,7 @@ steps:
98101
timeout_in_minutes: 300
99102
agents:
100103
provider: gcp
101-
image: family/elasticsearch-ubuntu-2004
104+
image: family/elasticsearch-ubuntu-2404
102105
machineType: custom-32-98304
103106
buildDirectory: /dev/shm/bk
104107
- 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:

0 commit comments

Comments
 (0)