Skip to content

Commit 62755bb

Browse files
committed
Merge branch 'main' into failure-store-naming-scheme
2 parents ed95fa4 + 4b90f01 commit 62755bb

File tree

348 files changed

+8888
-2841
lines changed

Some content is hidden

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

348 files changed

+8888
-2841
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: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
59+
BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
- sles-15
1515
- ubuntu-2004
1616
- ubuntu-2204
17+
- ubuntu-2404
1718
- rocky-8
1819
- rocky-9
1920
- rhel-8

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ steps:
1515
- sles-15
1616
- ubuntu-2004
1717
- ubuntu-2204
18+
- ubuntu-2404
1819
- rocky-8
1920
- rocky-9
2021
- rhel-8
@@ -286,8 +287,8 @@ steps:
286287
env:
287288
BWC_VERSION: 8.15.5
288289

289-
- label: "{{matrix.image}} / 8.16.2 / packaging-tests-upgrade"
290-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.2
290+
- label: "{{matrix.image}} / 8.16.3 / packaging-tests-upgrade"
291+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.3
291292
timeout_in_minutes: 300
292293
matrix:
293294
setup:
@@ -300,7 +301,7 @@ steps:
300301
machineType: custom-16-32768
301302
buildDirectory: /dev/shm/bk
302303
env:
303-
BWC_VERSION: 8.16.2
304+
BWC_VERSION: 8.16.3
304305

305306
- label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
306307
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
- sles-15
1515
- ubuntu-2004
1616
- ubuntu-2204
17+
- ubuntu-2404
1718
- rocky-8
1819
- rocky-9
1920
- rhel-8
@@ -62,6 +63,7 @@ steps:
6263
image:
6364
- almalinux-8-aarch64
6465
- ubuntu-2004-aarch64
66+
- ubuntu-2404-aarch64
6567
GRADLE_TASK:
6668
- checkPart1
6769
- checkPart2

.buildkite/pipelines/periodic.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ steps:
306306
- signal_reason: agent_stop
307307
limit: 3
308308

309-
- label: 8.16.2 / bwc
310-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.2#bwcTest
309+
- label: 8.16.3 / bwc
310+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.3#bwcTest
311311
timeout_in_minutes: 300
312312
agents:
313313
provider: gcp
@@ -316,7 +316,7 @@ steps:
316316
buildDirectory: /dev/shm/bk
317317
preemptible: true
318318
env:
319-
BWC_VERSION: 8.16.2
319+
BWC_VERSION: 8.16.3
320320
retry:
321321
automatic:
322322
- exit_status: "-1"
@@ -448,7 +448,7 @@ steps:
448448
setup:
449449
ES_RUNTIME_JAVA:
450450
- openjdk21
451-
BWC_VERSION: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
451+
BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
452452
agents:
453453
provider: gcp
454454
image: family/elasticsearch-ubuntu-2004
@@ -490,7 +490,7 @@ steps:
490490
ES_RUNTIME_JAVA:
491491
- openjdk21
492492
- openjdk23
493-
BWC_VERSION: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
493+
BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
494494
agents:
495495
provider: gcp
496496
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ steps:
1717
- sles-15
1818
- ubuntu-2004
1919
- ubuntu-2204
20+
- ubuntu-2404
2021
- rocky-8
2122
- rocky-9
2223
- rhel-8

.buildkite/scripts/gradle-configuration-cache-validation.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
set -euo pipefail
44

55
# This is a workaround for https://github.com/gradle/gradle/issues/28159
6-
.ci/scripts/run-gradle.sh --no-daemon precommit
6+
.ci/scripts/run-gradle.sh --no-daemon $@
77

8-
.ci/scripts/run-gradle.sh --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2
8+
.ci/scripts/run-gradle.sh --configuration-cache -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 $@
99

1010
# Create a temporary file
1111
tmpOutputFile=$(mktemp)
1212
trap "rm $tmpOutputFile" EXIT
1313

1414
echo "2nd run"
15-
.ci/scripts/run-gradle.sh --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 | tee $tmpOutputFile
15+
.ci/scripts/run-gradle.sh --configuration-cache -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 $@ | tee $tmpOutputFile
1616

1717
# Check if the command was successful
1818
if grep -q "Configuration cache entry reused." $tmpOutputFile; then

.ci/bwcVersions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ BWC_VERSION:
1515
- "8.13.4"
1616
- "8.14.3"
1717
- "8.15.5"
18-
- "8.16.2"
18+
- "8.16.3"
1919
- "8.17.1"
2020
- "8.18.0"
2121
- "9.0.0"

.ci/scripts/run-gradle.sh

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,39 @@ mkdir -p ~/.gradle/init.d && cp -v $WORKSPACE/.ci/init.gradle ~/.gradle/init.d
55

66
MAX_WORKERS=4
77

8-
# Don't run this stuff on Windows
9-
if ! uname -a | grep -q MING; then
10-
# drop page cache and kernel slab objects on linux
11-
[[ -x /usr/local/sbin/drop-caches ]] && sudo /usr/local/sbin/drop-caches
8+
if [ -z "$MAX_WORKER_ENV" ]; then
9+
# Don't run this stuff on Windows
10+
if ! uname -a | grep -q MING; then
11+
# drop page cache and kernel slab objects on linux
12+
[[ -x /usr/local/sbin/drop-caches ]] && sudo /usr/local/sbin/drop-caches
1213

13-
if [ "$(uname -m)" = "arm64" ] || [ "$(uname -m)" = "aarch64" ]; then
14-
MAX_WORKERS=16
15-
elif [ -f /proc/cpuinfo ]; then
16-
MAX_WORKERS=`grep '^cpu\scores' /proc/cpuinfo | uniq | sed 's/\s\+//g' | cut -d':' -f 2`
17-
else
18-
if [[ "$OSTYPE" == "darwin"* ]]; then
19-
MAX_WORKERS=`sysctl -n hw.physicalcpu | sed 's/\s\+//g'`
20-
else
21-
echo "Unsupported OS Type: $OSTYPE"
22-
exit 1
23-
fi
24-
fi
25-
if pwd | grep -v -q ^/dev/shm ; then
26-
echo "Not running on a ramdisk, reducing number of workers"
27-
MAX_WORKERS=$(($MAX_WORKERS*2/3))
28-
fi
14+
if [ "$(uname -m)" = "arm64" ] || [ "$(uname -m)" = "aarch64" ]; then
15+
MAX_WORKERS=16
16+
elif [ -f /proc/cpuinfo ]; then
17+
MAX_WORKERS=`grep '^cpu\scores' /proc/cpuinfo | uniq | sed 's/\s\+//g' | cut -d':' -f 2`
18+
else
19+
if [[ "$OSTYPE" == "darwin"* ]]; then
20+
MAX_WORKERS=`sysctl -n hw.physicalcpu | sed 's/\s\+//g'`
21+
else
22+
echo "Unsupported OS Type: $OSTYPE"
23+
exit 1
24+
fi
25+
fi
26+
if pwd | grep -v -q ^/dev/shm ; then
27+
echo "Not running on a ramdisk, reducing number of workers"
28+
MAX_WORKERS=$(($MAX_WORKERS*2/3))
29+
fi
2930

30-
# Export glibc version as environment variable since some BWC tests are incompatible with later versions
31-
export GLIBC_VERSION=$(ldd --version | grep '^ldd' | sed 's/.* \([1-9]\.[0-9]*\).*/\1/')
32-
fi
31+
# Export glibc version as environment variable since some BWC tests are incompatible with later versions
32+
export GLIBC_VERSION=$(ldd --version | grep '^ldd' | sed 's/.* \([1-9]\.[0-9]*\).*/\1/')
33+
fi
3334

34-
# Running on 2-core machines without ramdisk can make this value be 0
35-
if [[ "$MAX_WORKERS" == "0" ]]; then
36-
MAX_WORKERS=1
35+
# Running on 2-core machines without ramdisk can make this value be 0
36+
if [[ "$MAX_WORKERS" == "0" ]]; then
37+
MAX_WORKERS=1
38+
fi
39+
else
40+
MAX_WORKERS=$MAX_WORKER_ENV
3741
fi
3842

3943
set -e

.ci/snapshotBwcVersions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BWC_VERSION:
2-
- "8.16.2"
2+
- "8.16.3"
33
- "8.17.1"
44
- "8.18.0"
55
- "9.0.0"

0 commit comments

Comments
 (0)