Skip to content

Commit c90ea18

Browse files
chrisparrinellochrisparrinello
authored
Merge branch 'main' into can_match_phase_shard_metric
2 parents 4282149 + 9de36af commit c90ea18

File tree

186 files changed

+2569
-956
lines changed

Some content is hidden

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

186 files changed

+2569
-956
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
68+
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.0", "9.3.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ steps:
347347
- signal_reason: agent_stop
348348
limit: 3
349349

350-
- label: 8.18.9 / bwc
351-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.9#bwcTest
350+
- label: 8.18.8 / bwc
351+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.8#bwcTest
352352
timeout_in_minutes: 300
353353
agents:
354354
provider: gcp
@@ -357,7 +357,7 @@ steps:
357357
buildDirectory: /dev/shm/bk
358358
preemptible: true
359359
env:
360-
BWC_VERSION: 8.18.9
360+
BWC_VERSION: 8.18.8
361361
retry:
362362
automatic:
363363
- exit_status: "-1"
@@ -385,8 +385,8 @@ steps:
385385
- signal_reason: agent_stop
386386
limit: 3
387387

388-
- label: 9.0.9 / bwc
389-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.9#bwcTest
388+
- label: 9.0.8 / bwc
389+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.8#bwcTest
390390
timeout_in_minutes: 300
391391
agents:
392392
provider: gcp
@@ -395,7 +395,7 @@ steps:
395395
buildDirectory: /dev/shm/bk
396396
preemptible: true
397397
env:
398-
BWC_VERSION: 9.0.9
398+
BWC_VERSION: 9.0.8
399399
retry:
400400
automatic:
401401
- exit_status: "-1"
@@ -538,7 +538,7 @@ steps:
538538
timeout_in_minutes: 300
539539
matrix:
540540
setup:
541-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
541+
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.0", "9.3.0"]
542542
agents:
543543
provider: gcp
544544
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ steps:
318318
env:
319319
BWC_VERSION: 8.17.10
320320

321-
- label: "{{matrix.image}} / 8.18.9 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.9
321+
- label: "{{matrix.image}} / 8.18.8 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.8
323323
timeout_in_minutes: 300
324324
matrix:
325325
setup:
@@ -332,7 +332,7 @@ steps:
332332
machineType: custom-16-32768
333333
buildDirectory: /dev/shm/bk
334334
env:
335-
BWC_VERSION: 8.18.9
335+
BWC_VERSION: 8.18.8
336336

337337
- label: "{{matrix.image}} / 8.19.6 / packaging-tests-upgrade"
338338
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.6
@@ -350,8 +350,8 @@ steps:
350350
env:
351351
BWC_VERSION: 8.19.6
352352

353-
- label: "{{matrix.image}} / 9.0.9 / packaging-tests-upgrade"
354-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.9
353+
- label: "{{matrix.image}} / 9.0.8 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
355355
timeout_in_minutes: 300
356356
matrix:
357357
setup:
@@ -364,7 +364,7 @@ steps:
364364
machineType: custom-16-32768
365365
buildDirectory: /dev/shm/bk
366366
env:
367-
BWC_VERSION: 9.0.9
367+
BWC_VERSION: 9.0.8
368368

369369
- label: "{{matrix.image}} / 9.1.6 / packaging-tests-upgrade"
370370
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.6

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.9 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.9#bwcTest
347+
- label: 8.18.8 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.8#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.9
357+
BWC_VERSION: 8.18.8
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.9 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.9#bwcTest
385+
- label: 9.0.8 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.8#bwcTest
387387
timeout_in_minutes: 300
388388
agents:
389389
provider: gcp
@@ -392,7 +392,7 @@ steps:
392392
buildDirectory: /dev/shm/bk
393393
preemptible: true
394394
env:
395-
BWC_VERSION: 9.0.9
395+
BWC_VERSION: 9.0.8
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -525,7 +525,7 @@ steps:
525525
setup:
526526
ES_RUNTIME_JAVA:
527527
- openjdk21
528-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
528+
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.0", "9.3.0"]
529529
agents:
530530
provider: gcp
531531
image: family/elasticsearch-ubuntu-2404
@@ -569,7 +569,7 @@ steps:
569569
ES_RUNTIME_JAVA:
570570
- openjdk21
571571
- openjdk23
572-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
572+
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.0", "9.3.0"]
573573
agents:
574574
provider: gcp
575575
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ BWC_VERSION:
1717
- "8.15.5"
1818
- "8.16.6"
1919
- "8.17.10"
20-
- "8.18.9"
20+
- "8.18.8"
2121
- "8.19.6"
22-
- "9.0.9"
22+
- "9.0.8"
2323
- "9.1.6"
2424
- "9.2.0"
2525
- "9.3.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
BWC_VERSION:
2-
- "8.18.9"
32
- "8.19.6"
4-
- "9.0.9"
53
- "9.1.6"
64
- "9.2.0"
75
- "9.3.0"

‎benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/ValuesSourceReaderBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public void benchmark() {
369369
blockFactory,
370370
ByteSizeValue.ofMb(1).getBytes(),
371371
fields(name),
372-
new IndexedByShardIdFromSingleton<>(new ValuesSourceReaderOperator.ShardContext(reader, () -> {
372+
new IndexedByShardIdFromSingleton<>(new ValuesSourceReaderOperator.ShardContext(reader, (sourcePaths) -> {
373373
throw new UnsupportedOperationException("can't load _source here");
374374
}, EsqlPlugin.STORED_FIELDS_SEQUENTIAL_PROPORTION.getDefault(Settings.EMPTY))),
375375
0

‎benchmarks/src/main/java/org/elasticsearch/benchmark/exponentialhistogram/ExponentialHistogramMergeBench.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import org.elasticsearch.exponentialhistogram.ExponentialHistogramCircuitBreaker;
1717
import org.elasticsearch.exponentialhistogram.ExponentialHistogramGenerator;
1818
import org.elasticsearch.exponentialhistogram.ExponentialHistogramMerger;
19+
import org.elasticsearch.xpack.analytics.mapper.IndexWithCount;
1920
import org.elasticsearch.xpack.exponentialhistogram.CompressedExponentialHistogram;
20-
import org.elasticsearch.xpack.exponentialhistogram.IndexWithCount;
2121
import org.openjdk.jmh.annotations.Benchmark;
2222
import org.openjdk.jmh.annotations.BenchmarkMode;
2323
import org.openjdk.jmh.annotations.Fork;

‎branches.json‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,13 @@
1313
"branch" : "9.1",
1414
"version" : "9.1.6"
1515
},
16-
{
17-
"branch" : "9.0",
18-
"version" : "9.0.9"
19-
},
2016
{
2117
"branch" : "8.19",
2218
"version" : "8.19.6"
2319
},
24-
{
25-
"branch" : "8.18",
26-
"version" : "8.18.9"
27-
},
2820
{
2921
"branch" : "7.17",
3022
"version" : "7.17.30"
3123
}
3224
]
33-
}
25+
}

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionValidationFuncTest.groovy‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,7 @@ class TransportVersionValidationFuncTest extends AbstractTransportVersionFuncTes
312312
result.task(":myserver:validateTransportVersionResources").outcome == TaskOutcome.SUCCESS
313313
}
314314

315-
def "modification checks use PR base branch in CI"() {
316-
given:
315+
void baseBranchSetup() {
317316
// create 9.1 branch
318317
execute("git checkout -b 9.1")
319318
// setup 9.1 upper bound as if 9.2 was just branched, so no patches yet
@@ -342,10 +341,27 @@ class TransportVersionValidationFuncTest extends AbstractTransportVersionFuncTes
342341
currentUpperBoundName = '9.1'
343342
}
344343
"""
344+
}
345+
346+
def "modification checks use PR base branch in CI"() {
347+
given:
348+
baseBranchSetup()
349+
350+
when:
351+
def result = gradleRunner("validateTransportVersionResources")
352+
.withEnvironment(Map.of("BUILDKITE_PULL_REQUEST_BASE_BRANCH", "9.1", "BUILDKITE_BRANCH", "foobar")).build()
353+
354+
then:
355+
result.task(":myserver:validateTransportVersionResources").outcome == TaskOutcome.SUCCESS
356+
}
357+
358+
def "modification checks use buildkite base branch in CI if not in PR"() {
359+
given:
360+
baseBranchSetup()
345361

346362
when:
347363
def result = gradleRunner("validateTransportVersionResources")
348-
.withEnvironment(Map.of("BUILDKITE_PULL_REQUEST_BASE_BRANCH", "9.1")).build()
364+
.withEnvironment(Map.of("BUILDKITE_BRANCH", "9.1")).build()
349365

350366
then:
351367
result.task(":myserver:validateTransportVersionResources").outcome == TaskOutcome.SUCCESS

0 commit comments

Comments
 (0)