Skip to content

Commit 282d849

Browse files
jonathan-buttnerjonathan-buttner
committed
Merge branch 'main' of github.com:elastic/elasticsearch into inference-eis-acl
2 parents fd7fd59 + 787a16d commit 282d849

File tree

176 files changed

+3761
-2004
lines changed

Some content is hidden

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

176 files changed

+3761
-2004
lines changed

‎.buildkite/pipelines/pull-request/release-tests.yml‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
config:
22
allow-labels: test-release
33
steps:
4-
- label: release-tests
5-
command: .buildkite/scripts/release-tests.sh
6-
timeout_in_minutes: 300
7-
agents:
8-
provider: gcp
9-
image: family/elasticsearch-ubuntu-2004
10-
diskSizeGb: 350
11-
machineType: custom-32-98304
4+
- group: release-tests
5+
steps:
6+
- label: "{{matrix.CHECK_TASK}} / release-tests"
7+
key: "packaging-tests-unix"
8+
command: .buildkite/scripts/release-tests.sh {{matrix.CHECK_TASK}}
9+
timeout_in_minutes: 120
10+
matrix:
11+
setup:
12+
CHECK_TASK:
13+
- checkPart1
14+
- checkPart2
15+
- checkPart3
16+
- checkPart4
17+
- checkPart5
18+
agents:
19+
provider: gcp
20+
image: family/elasticsearch-ubuntu-2004
21+
diskSizeGb: 350
22+
machineType: custom-32-98304

‎.buildkite/scripts/release-tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/m
2020
curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT.zip
2121

2222
.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false -Dbuild.ml_cpp.repo=file://${ML_IVY_REPO} \
23-
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef assemble functionalTests
23+
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef ${@:-functionalTests}

‎build.gradle‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,22 +293,57 @@ allprojects {
293293
}
294294
}
295295

296+
ext.withReleaseBuild = { Closure config ->
297+
if(buildParams.snapshotBuild == false) {
298+
config.call()
299+
}
300+
}
301+
296302
plugins.withId('lifecycle-base') {
297303
if (project.path.startsWith(":x-pack:")) {
298304
if (project.path.contains("security") || project.path.contains(":ml")) {
299-
tasks.register('checkPart4') { dependsOn 'check' }
305+
tasks.register('checkPart4') {
306+
dependsOn 'check'
307+
withReleaseBuild {
308+
dependsOn 'assemble'
309+
}
310+
}
300311
} else if (project.path == ":x-pack:plugin" || project.path.contains("ql") || project.path.contains("smoke-test")) {
301-
tasks.register('checkPart3') { dependsOn 'check' }
312+
tasks.register('checkPart3') {
313+
dependsOn 'check'
314+
withReleaseBuild {
315+
dependsOn 'assemble'
316+
}
317+
}
302318
} else if (project.path.contains("multi-node")) {
303-
tasks.register('checkPart5') { dependsOn 'check' }
319+
tasks.register('checkPart5') {
320+
dependsOn 'check'
321+
withReleaseBuild {
322+
dependsOn 'assemble'
323+
}
324+
}
304325
} else {
305-
tasks.register('checkPart2') { dependsOn 'check' }
326+
tasks.register('checkPart2') {
327+
dependsOn 'check'
328+
withReleaseBuild {
329+
dependsOn 'assemble'
330+
}
331+
}
306332
}
307333
} else {
308-
tasks.register('checkPart1') { dependsOn 'check' }
334+
tasks.register('checkPart1') {
335+
dependsOn 'check'
336+
withReleaseBuild {
337+
dependsOn 'assemble'
338+
}
339+
}
340+
}
341+
tasks.register('functionalTests') {
342+
dependsOn 'check'
343+
withReleaseBuild {
344+
dependsOn 'assemble'
345+
}
309346
}
310-
311-
tasks.register('functionalTests') { dependsOn 'check' }
312347
}
313348

314349
/*

‎docs/changelog/119898.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 119898
2+
summary: Resolve/cluster allows querying for cluster info only (no index expression
3+
required)
4+
area: CCS
5+
type: enhancement
6+
issues: []

‎docs/changelog/120334.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120334
2+
summary: Introduce `IndexSettingDeprecatedInV8AndRemovedInV9` Setting property
3+
area: Infra/Settings
4+
type: enhancement
5+
issues: []

‎docs/changelog/120405.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120405
2+
summary: Automatically rollover legacy ml indices
3+
area: Machine Learning
4+
type: upgrade
5+
issues: []

‎docs/changelog/120547.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120547
2+
summary: Consistent mapping for OTel log and event bodies
3+
area: Data streams
4+
type: enhancement
5+
issues: []

‎docs/changelog/120629.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 120629
2+
summary: Report Deprecated Indices That Are Flagged To Ignore Migration Reindex As
3+
A Warning
4+
area: Data streams
5+
type: enhancement
6+
issues: []

‎docs/changelog/120643.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120643
2+
summary: Remove index blocks by default in `create_from`
3+
area: Indices APIs
4+
type: enhancement
5+
issues: []

‎docs/changelog/120662.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120662
2+
summary: Fix broken yaml test `30_create_from`
3+
area: Indices APIs
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)