Skip to content

Commit 48c937f

Browse files
v1vv1v
committed
Merge remote-tracking branch 'upstream/main' into feature/bump-automation-ironbank-ubi
* upstream/main: (302 commits) Deduplicate BucketOrder when deserializing (elastic#112707) Introduce test utils for ingest pipelines (elastic#112733) [Test] Account for auto-repairing for shard gen file (elastic#112778) Do not throw in task enqueued by CancellableRunner (elastic#112780) Mute org.elasticsearch.script.StatsSummaryTests testEqualsAndHashCode elastic#112439 Mute org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT testTransportException elastic#112779 Use a dedicated test executor in MockTransportService (elastic#112748) Estimate segment field usages (elastic#112760) (Doc+) Inference Pipeline ignores Mapping Analyzers (elastic#112522) Fix verifyVersions task (elastic#112765) (Doc+) Terminating Exit Codes (elastic#112530) (Doc+) CAT Nodes default columns (elastic#112715) [DOCS] Augment installation warnings (elastic#112756) Mute org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT testCorruption elastic#112769 Bump Elasticsearch to a minimum of JDK 21 (elastic#112252) ESQL: Compute support for filtering ungrouped aggs (elastic#112717) Bump Elasticsearch version to 9.0.0 (elastic#112570) add CDR related data streams to kibana_system priviliges (elastic#112655) Support widening of numeric types in union-types (elastic#112610) Introduce data stream options and failure store configuration classes (elastic#109515) ...
2 parents 0c522f2 + 0ab2afb commit 48c937f

File tree

1,812 files changed

+43348
-19899
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,812 files changed

+43348
-19899
lines changed

‎.backportrc.json‎

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

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ steps:
6262
timeout_in_minutes: 300
6363
matrix:
6464
setup:
65-
BWC_VERSION: ["7.17.24", "8.15.1", "8.16.0"]
65+
BWC_VERSION: ["8.15.2", "8.16.0", "9.0.0"]
6666
agents:
6767
provider: gcp
6868
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 20 additions & 309 deletions
Original file line numberDiff line numberDiff line change
@@ -33,312 +33,6 @@ steps:
3333
env: {}
3434
- group: packaging-tests-upgrade
3535
steps:
36-
- label: "{{matrix.image}} / 7.0.1 / packaging-tests-upgrade"
37-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.0.1
38-
timeout_in_minutes: 300
39-
matrix:
40-
setup:
41-
image:
42-
- rocky-8
43-
- ubuntu-2004
44-
agents:
45-
provider: gcp
46-
image: family/elasticsearch-{{matrix.image}}
47-
machineType: custom-16-32768
48-
buildDirectory: /dev/shm/bk
49-
diskSizeGb: 250
50-
env:
51-
BWC_VERSION: 7.0.1
52-
53-
- label: "{{matrix.image}} / 7.1.1 / packaging-tests-upgrade"
54-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.1.1
55-
timeout_in_minutes: 300
56-
matrix:
57-
setup:
58-
image:
59-
- rocky-8
60-
- ubuntu-2004
61-
agents:
62-
provider: gcp
63-
image: family/elasticsearch-{{matrix.image}}
64-
machineType: custom-16-32768
65-
buildDirectory: /dev/shm/bk
66-
diskSizeGb: 250
67-
env:
68-
BWC_VERSION: 7.1.1
69-
70-
- label: "{{matrix.image}} / 7.2.1 / packaging-tests-upgrade"
71-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.2.1
72-
timeout_in_minutes: 300
73-
matrix:
74-
setup:
75-
image:
76-
- rocky-8
77-
- ubuntu-2004
78-
agents:
79-
provider: gcp
80-
image: family/elasticsearch-{{matrix.image}}
81-
machineType: custom-16-32768
82-
buildDirectory: /dev/shm/bk
83-
diskSizeGb: 250
84-
env:
85-
BWC_VERSION: 7.2.1
86-
87-
- label: "{{matrix.image}} / 7.3.2 / packaging-tests-upgrade"
88-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.3.2
89-
timeout_in_minutes: 300
90-
matrix:
91-
setup:
92-
image:
93-
- rocky-8
94-
- ubuntu-2004
95-
agents:
96-
provider: gcp
97-
image: family/elasticsearch-{{matrix.image}}
98-
machineType: custom-16-32768
99-
buildDirectory: /dev/shm/bk
100-
diskSizeGb: 250
101-
env:
102-
BWC_VERSION: 7.3.2
103-
104-
- label: "{{matrix.image}} / 7.4.2 / packaging-tests-upgrade"
105-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.4.2
106-
timeout_in_minutes: 300
107-
matrix:
108-
setup:
109-
image:
110-
- rocky-8
111-
- ubuntu-2004
112-
agents:
113-
provider: gcp
114-
image: family/elasticsearch-{{matrix.image}}
115-
machineType: custom-16-32768
116-
buildDirectory: /dev/shm/bk
117-
diskSizeGb: 250
118-
env:
119-
BWC_VERSION: 7.4.2
120-
121-
- label: "{{matrix.image}} / 7.5.2 / packaging-tests-upgrade"
122-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.5.2
123-
timeout_in_minutes: 300
124-
matrix:
125-
setup:
126-
image:
127-
- rocky-8
128-
- ubuntu-2004
129-
agents:
130-
provider: gcp
131-
image: family/elasticsearch-{{matrix.image}}
132-
machineType: custom-16-32768
133-
buildDirectory: /dev/shm/bk
134-
diskSizeGb: 250
135-
env:
136-
BWC_VERSION: 7.5.2
137-
138-
- label: "{{matrix.image}} / 7.6.2 / packaging-tests-upgrade"
139-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.6.2
140-
timeout_in_minutes: 300
141-
matrix:
142-
setup:
143-
image:
144-
- rocky-8
145-
- ubuntu-2004
146-
agents:
147-
provider: gcp
148-
image: family/elasticsearch-{{matrix.image}}
149-
machineType: custom-16-32768
150-
buildDirectory: /dev/shm/bk
151-
diskSizeGb: 250
152-
env:
153-
BWC_VERSION: 7.6.2
154-
155-
- label: "{{matrix.image}} / 7.7.1 / packaging-tests-upgrade"
156-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.7.1
157-
timeout_in_minutes: 300
158-
matrix:
159-
setup:
160-
image:
161-
- rocky-8
162-
- ubuntu-2004
163-
agents:
164-
provider: gcp
165-
image: family/elasticsearch-{{matrix.image}}
166-
machineType: custom-16-32768
167-
buildDirectory: /dev/shm/bk
168-
diskSizeGb: 250
169-
env:
170-
BWC_VERSION: 7.7.1
171-
172-
- label: "{{matrix.image}} / 7.8.1 / packaging-tests-upgrade"
173-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.8.1
174-
timeout_in_minutes: 300
175-
matrix:
176-
setup:
177-
image:
178-
- rocky-8
179-
- ubuntu-2004
180-
agents:
181-
provider: gcp
182-
image: family/elasticsearch-{{matrix.image}}
183-
machineType: custom-16-32768
184-
buildDirectory: /dev/shm/bk
185-
diskSizeGb: 250
186-
env:
187-
BWC_VERSION: 7.8.1
188-
189-
- label: "{{matrix.image}} / 7.9.3 / packaging-tests-upgrade"
190-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.9.3
191-
timeout_in_minutes: 300
192-
matrix:
193-
setup:
194-
image:
195-
- rocky-8
196-
- ubuntu-2004
197-
agents:
198-
provider: gcp
199-
image: family/elasticsearch-{{matrix.image}}
200-
machineType: custom-16-32768
201-
buildDirectory: /dev/shm/bk
202-
diskSizeGb: 250
203-
env:
204-
BWC_VERSION: 7.9.3
205-
206-
- label: "{{matrix.image}} / 7.10.2 / packaging-tests-upgrade"
207-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.10.2
208-
timeout_in_minutes: 300
209-
matrix:
210-
setup:
211-
image:
212-
- rocky-8
213-
- ubuntu-2004
214-
agents:
215-
provider: gcp
216-
image: family/elasticsearch-{{matrix.image}}
217-
machineType: custom-16-32768
218-
buildDirectory: /dev/shm/bk
219-
diskSizeGb: 250
220-
env:
221-
BWC_VERSION: 7.10.2
222-
223-
- label: "{{matrix.image}} / 7.11.2 / packaging-tests-upgrade"
224-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.11.2
225-
timeout_in_minutes: 300
226-
matrix:
227-
setup:
228-
image:
229-
- rocky-8
230-
- ubuntu-2004
231-
agents:
232-
provider: gcp
233-
image: family/elasticsearch-{{matrix.image}}
234-
machineType: custom-16-32768
235-
buildDirectory: /dev/shm/bk
236-
diskSizeGb: 250
237-
env:
238-
BWC_VERSION: 7.11.2
239-
240-
- label: "{{matrix.image}} / 7.12.1 / packaging-tests-upgrade"
241-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.12.1
242-
timeout_in_minutes: 300
243-
matrix:
244-
setup:
245-
image:
246-
- rocky-8
247-
- ubuntu-2004
248-
agents:
249-
provider: gcp
250-
image: family/elasticsearch-{{matrix.image}}
251-
machineType: custom-16-32768
252-
buildDirectory: /dev/shm/bk
253-
diskSizeGb: 250
254-
env:
255-
BWC_VERSION: 7.12.1
256-
257-
- label: "{{matrix.image}} / 7.13.4 / packaging-tests-upgrade"
258-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.13.4
259-
timeout_in_minutes: 300
260-
matrix:
261-
setup:
262-
image:
263-
- rocky-8
264-
- ubuntu-2004
265-
agents:
266-
provider: gcp
267-
image: family/elasticsearch-{{matrix.image}}
268-
machineType: custom-16-32768
269-
buildDirectory: /dev/shm/bk
270-
diskSizeGb: 250
271-
env:
272-
BWC_VERSION: 7.13.4
273-
274-
- label: "{{matrix.image}} / 7.14.2 / packaging-tests-upgrade"
275-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.14.2
276-
timeout_in_minutes: 300
277-
matrix:
278-
setup:
279-
image:
280-
- rocky-8
281-
- ubuntu-2004
282-
agents:
283-
provider: gcp
284-
image: family/elasticsearch-{{matrix.image}}
285-
machineType: custom-16-32768
286-
buildDirectory: /dev/shm/bk
287-
diskSizeGb: 250
288-
env:
289-
BWC_VERSION: 7.14.2
290-
291-
- label: "{{matrix.image}} / 7.15.2 / packaging-tests-upgrade"
292-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.15.2
293-
timeout_in_minutes: 300
294-
matrix:
295-
setup:
296-
image:
297-
- rocky-8
298-
- ubuntu-2004
299-
agents:
300-
provider: gcp
301-
image: family/elasticsearch-{{matrix.image}}
302-
machineType: custom-16-32768
303-
buildDirectory: /dev/shm/bk
304-
diskSizeGb: 250
305-
env:
306-
BWC_VERSION: 7.15.2
307-
308-
- label: "{{matrix.image}} / 7.16.3 / packaging-tests-upgrade"
309-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.16.3
310-
timeout_in_minutes: 300
311-
matrix:
312-
setup:
313-
image:
314-
- rocky-8
315-
- ubuntu-2004
316-
agents:
317-
provider: gcp
318-
image: family/elasticsearch-{{matrix.image}}
319-
machineType: custom-16-32768
320-
buildDirectory: /dev/shm/bk
321-
diskSizeGb: 250
322-
env:
323-
BWC_VERSION: 7.16.3
324-
325-
- label: "{{matrix.image}} / 7.17.24 / packaging-tests-upgrade"
326-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.24
327-
timeout_in_minutes: 300
328-
matrix:
329-
setup:
330-
image:
331-
- rocky-8
332-
- ubuntu-2004
333-
agents:
334-
provider: gcp
335-
image: family/elasticsearch-{{matrix.image}}
336-
machineType: custom-16-32768
337-
buildDirectory: /dev/shm/bk
338-
diskSizeGb: 250
339-
env:
340-
BWC_VERSION: 7.17.24
341-
34236
- label: "{{matrix.image}} / 8.0.1 / packaging-tests-upgrade"
34337
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.1
34438
timeout_in_minutes: 300
@@ -594,8 +288,8 @@ steps:
594288
env:
595289
BWC_VERSION: 8.14.3
596290

597-
- label: "{{matrix.image}} / 8.15.1 / packaging-tests-upgrade"
598-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.1
291+
- label: "{{matrix.image}} / 8.15.2 / packaging-tests-upgrade"
292+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.2
599293
timeout_in_minutes: 300
600294
matrix:
601295
setup:
@@ -609,7 +303,7 @@ steps:
609303
buildDirectory: /dev/shm/bk
610304
diskSizeGb: 250
611305
env:
612-
BWC_VERSION: 8.15.1
306+
BWC_VERSION: 8.15.2
613307

614308
- label: "{{matrix.image}} / 8.16.0 / packaging-tests-upgrade"
615309
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.0
@@ -628,6 +322,23 @@ steps:
628322
env:
629323
BWC_VERSION: 8.16.0
630324

325+
- label: "{{matrix.image}} / 9.0.0 / packaging-tests-upgrade"
326+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.0
327+
timeout_in_minutes: 300
328+
matrix:
329+
setup:
330+
image:
331+
- rocky-8
332+
- ubuntu-2004
333+
agents:
334+
provider: gcp
335+
image: family/elasticsearch-{{matrix.image}}
336+
machineType: custom-16-32768
337+
buildDirectory: /dev/shm/bk
338+
diskSizeGb: 250
339+
env:
340+
BWC_VERSION: 9.0.0
341+
631342
- group: packaging-tests-windows
632343
steps:
633344
- label: "{{matrix.image}} / packaging-tests-windows"

0 commit comments

Comments
 (0)