Skip to content

Commit 4070231

Browse files
jonathan-buttnerjonathan-buttner
committed
Merge branch 'main' of github.com:elastic/elasticsearch into ml-inference-unified-api-elastic
2 parents 86d477e + f05c9b0 commit 4070231

File tree

1,321 files changed

+32834
-15481
lines changed

Some content is hidden

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

1,321 files changed

+32834
-15481
lines changed

‎.backportrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "8.x", "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", "8.x", "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" : {
66
"^v9.0.0$" : "main",
7-
"^v8.17.0$" : "8.x",
7+
"^v8.18.0$" : "8.x",
88
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
99
}
1010
}

‎.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.1", "8.17.0", "9.0.0"]
59+
BWC_VERSION: ["8.16.2", "8.17.0", "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
@@ -8,6 +8,7 @@ steps:
88
setup:
99
image:
1010
- debian-11
11+
- debian-12
1112
- opensuse-leap-15
1213
- oraclelinux-7
1314
- oraclelinux-8

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

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ steps:
99
setup:
1010
image:
1111
- debian-11
12+
- debian-12
1213
- opensuse-leap-15
1314
- oraclelinux-7
1415
- oraclelinux-8
@@ -288,8 +289,8 @@ steps:
288289
env:
289290
BWC_VERSION: 8.15.4
290291

291-
- label: "{{matrix.image}} / 8.16.1 / packaging-tests-upgrade"
292-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.1
292+
- label: "{{matrix.image}} / 8.16.2 / packaging-tests-upgrade"
293+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.2
293294
timeout_in_minutes: 300
294295
matrix:
295296
setup:
@@ -302,7 +303,7 @@ steps:
302303
machineType: custom-16-32768
303304
buildDirectory: /dev/shm/bk
304305
env:
305-
BWC_VERSION: 8.16.1
306+
BWC_VERSION: 8.16.2
306307

307308
- label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
308309
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0
@@ -320,6 +321,22 @@ steps:
320321
env:
321322
BWC_VERSION: 8.17.0
322323

324+
- label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
325+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0
326+
timeout_in_minutes: 300
327+
matrix:
328+
setup:
329+
image:
330+
- rocky-8
331+
- ubuntu-2004
332+
agents:
333+
provider: gcp
334+
image: family/elasticsearch-{{matrix.image}}
335+
machineType: custom-16-32768
336+
buildDirectory: /dev/shm/bk
337+
env:
338+
BWC_VERSION: 8.18.0
339+
323340
- label: "{{matrix.image}} / 9.0.0 / packaging-tests-upgrade"
324341
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.0
325342
timeout_in_minutes: 300

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ steps:
88
setup:
99
image:
1010
- debian-11
11+
- debian-12
1112
- opensuse-leap-15
1213
- oraclelinux-7
1314
- oraclelinux-8

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 24 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.1 / bwc
310-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.1#bwcTest
309+
- label: 8.16.2 / bwc
310+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.2#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.1
319+
BWC_VERSION: 8.16.2
320320
retry:
321321
automatic:
322322
- exit_status: "-1"
@@ -344,6 +344,25 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347+
- label: 8.18.0 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.0#bwcTest
349+
timeout_in_minutes: 300
350+
agents:
351+
provider: gcp
352+
image: family/elasticsearch-ubuntu-2004
353+
machineType: n1-standard-32
354+
buildDirectory: /dev/shm/bk
355+
preemptible: true
356+
env:
357+
BWC_VERSION: 8.18.0
358+
retry:
359+
automatic:
360+
- exit_status: "-1"
361+
limit: 3
362+
signal_reason: none
363+
- signal_reason: agent_stop
364+
limit: 3
365+
347366
- label: 9.0.0 / bwc
348367
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.0#bwcTest
349368
timeout_in_minutes: 300
@@ -429,7 +448,7 @@ steps:
429448
setup:
430449
ES_RUNTIME_JAVA:
431450
- openjdk21
432-
BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
451+
BWC_VERSION: ["8.16.2", "8.17.0", "8.18.0", "9.0.0"]
433452
agents:
434453
provider: gcp
435454
image: family/elasticsearch-ubuntu-2004
@@ -471,7 +490,7 @@ steps:
471490
ES_RUNTIME_JAVA:
472491
- openjdk21
473492
- openjdk23
474-
BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
493+
BWC_VERSION: ["8.16.2", "8.17.0", "8.18.0", "9.0.0"]
475494
agents:
476495
provider: gcp
477496
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 9 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,68 +3,15 @@ config:
33
steps:
44
- group: packaging-tests-unix
55
steps:
6-
- label: "{{matrix.image}} / docker / packaging-tests-unix"
7-
key: "packaging-tests-unix-docker"
8-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.docker-cloud-ess
9-
timeout_in_minutes: 300
10-
matrix:
11-
setup:
12-
image:
13-
- debian-11
14-
- opensuse-leap-15
15-
- oraclelinux-7
16-
- oraclelinux-8
17-
- sles-12
18-
- sles-15
19-
- ubuntu-1804
20-
- ubuntu-2004
21-
- ubuntu-2204
22-
- rocky-8
23-
- rocky-9
24-
- rhel-7
25-
- rhel-8
26-
- rhel-9
27-
- almalinux-8
28-
agents:
29-
provider: gcp
30-
image: family/elasticsearch-{{matrix.image}}
31-
diskSizeGb: 350
32-
machineType: custom-16-32768
33-
- label: "{{matrix.image}} / packages / packaging-tests-unix"
34-
key: "packaging-tests-unix-packages"
35-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.packages
36-
timeout_in_minutes: 300
37-
matrix:
38-
setup:
39-
image:
40-
- debian-11
41-
- opensuse-leap-15
42-
- oraclelinux-7
43-
- oraclelinux-8
44-
- sles-12
45-
- sles-15
46-
- ubuntu-1804
47-
- ubuntu-2004
48-
- ubuntu-2204
49-
- rocky-8
50-
- rocky-9
51-
- rhel-7
52-
- rhel-8
53-
- rhel-9
54-
- almalinux-8
55-
agents:
56-
provider: gcp
57-
image: family/elasticsearch-{{matrix.image}}
58-
diskSizeGb: 350
59-
machineType: custom-16-32768
60-
- label: "{{matrix.image}} / archives / packaging-tests-unix"
61-
key: "packaging-tests-unix-archives"
62-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.archives
6+
- label: "{{matrix.image}} / {{matrix.PACKAGING_TASK}} / packaging-tests-unix"
7+
key: "packaging-tests-unix"
8+
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.{{matrix.PACKAGING_TASK}}
639
timeout_in_minutes: 300
6410
matrix:
6511
setup:
6612
image:
6713
- debian-11
14+
- debian-12
6815
- opensuse-leap-15
6916
- oraclelinux-7
7017
- oraclelinux-8
@@ -79,6 +26,11 @@ steps:
7926
- rhel-8
8027
- rhel-9
8128
- almalinux-8
29+
PACKAGING_TASK:
30+
- docker
31+
- docker-cloud-ess
32+
- packages
33+
- archives
8234
agents:
8335
provider: gcp
8436
image: family/elasticsearch-{{matrix.image}}

‎.buildkite/scripts/dra-workflow.sh‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WORKFLOW="${DRA_WORKFLOW:-snapshot}"
66
BRANCH="${BUILDKITE_BRANCH:-}"
77

88
# Don't publish main branch to staging
9-
if [[ "$BRANCH" == "main" && "$WORKFLOW" == "staging" ]]; then
9+
if [[ ("$BRANCH" == "main" || "$BRANCH" == *.x) && "$WORKFLOW" == "staging" ]]; then
1010
exit 0
1111
fi
1212

@@ -75,6 +75,7 @@ find "$WORKSPACE" -type d -path "*/build/distributions" -exec chmod a+w {} \;
7575

7676
echo --- Running release-manager
7777

78+
set +e
7879
# Artifacts should be generated
7980
docker run --rm \
8081
--name release-manager \
@@ -91,4 +92,16 @@ docker run --rm \
9192
--version "$ES_VERSION" \
9293
--artifact-set main \
9394
--dependency "beats:https://artifacts-${WORKFLOW}.elastic.co/beats/${BEATS_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" \
94-
--dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json"
95+
--dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" \
96+
2>&1 | tee release-manager.log
97+
EXIT_CODE=$?
98+
set -e
99+
100+
# This failure is just generating a ton of noise right now, so let's just ignore it
101+
# This should be removed once this issue has been fixed
102+
if grep "elasticsearch-ubi-9.0.0-SNAPSHOT-docker-image.tar.gz" release-manager.log; then
103+
echo "Ignoring error about missing ubi artifact"
104+
exit 0
105+
fi
106+
107+
exit "$EXIT_CODE"

‎.ci/bwcVersions‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ BWC_VERSION:
1515
- "8.13.4"
1616
- "8.14.3"
1717
- "8.15.4"
18-
- "8.16.1"
18+
- "8.16.2"
1919
- "8.17.0"
20+
- "8.18.0"
2021
- "9.0.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
BWC_VERSION:
2-
- "8.16.1"
2+
- "8.16.2"
33
- "8.17.0"
4+
- "8.18.0"
45
- "9.0.0"

0 commit comments

Comments
 (0)