Skip to content

Commit 55c434c

Browse files
thecoopthecoop
committed
Merge branch 'main' into remove-old-invalidateapikeyrequest-transports
2 parents 911e99c + 7759083 commit 55c434c

File tree

447 files changed

+6765
-2607
lines changed

Some content is hidden

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

447 files changed

+6765
-2607
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@ steps:
77
matrix:
88
setup:
99
image:
10-
- debian-11
1110
- debian-12
1211
- opensuse-leap-15
13-
- oraclelinux-7
1412
- oraclelinux-8
15-
- sles-12
1613
- sles-15
17-
- ubuntu-1804
1814
- ubuntu-2004
1915
- ubuntu-2204
2016
- rocky-8
2117
- rocky-9
22-
- rhel-7
2318
- rhel-8
2419
- rhel-9
2520
- almalinux-8

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,14 @@ steps:
88
matrix:
99
setup:
1010
image:
11-
- debian-11
1211
- debian-12
1312
- opensuse-leap-15
14-
- oraclelinux-7
1513
- oraclelinux-8
16-
- sles-12
1714
- sles-15
18-
- ubuntu-1804
1915
- ubuntu-2004
2016
- ubuntu-2204
2117
- rocky-8
2218
- rocky-9
23-
- rhel-7
2419
- rhel-8
2520
- rhel-9
2621
- almalinux-8

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@ steps:
77
matrix:
88
setup:
99
image:
10-
- debian-11
1110
- debian-12
1211
- opensuse-leap-15
13-
- oraclelinux-7
1412
- oraclelinux-8
15-
- sles-12
1613
- sles-15
17-
- ubuntu-1804
1814
- ubuntu-2004
1915
- ubuntu-2204
2016
- rocky-8
2117
- rocky-9
22-
- rhel-7
2318
- rhel-8
2419
- rhel-9
2520
- almalinux-8
@@ -90,7 +85,6 @@ steps:
9085
setup:
9186
image:
9287
- amazonlinux-2023
93-
- amazonlinux-2
9488
agents:
9589
provider: aws
9690
imagePrefix: elasticsearch-{{matrix.image}}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,14 @@ steps:
1010
matrix:
1111
setup:
1212
image:
13-
- debian-11
1413
- debian-12
1514
- opensuse-leap-15
16-
- oraclelinux-7
1715
- oraclelinux-8
18-
- sles-12
1916
- sles-15
20-
- ubuntu-1804
2117
- ubuntu-2004
2218
- ubuntu-2204
2319
- rocky-8
2420
- rocky-9
25-
- rhel-7
2621
- rhel-8
2722
- rhel-9
2823
- almalinux-8

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* This class models the different Docker base images that are used to build Docker distributions of Elasticsearch.
1414
*/
1515
public enum DockerBase {
16-
// "latest" here is intentional, since the image name specifies "8"
17-
DEFAULT("docker.elastic.co/ubi8/ubi-minimal:latest", "", "microdnf"),
16+
// "latest" here is intentional, since the image name specifies "9"
17+
DEFAULT("docker.elastic.co/ubi9/ubi-minimal:latest", "", "microdnf"),
1818

1919
// The Iron Bank base image is UBI (albeit hardened), but we are required to parameterize the Docker build
2020
IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum"),

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ commonscodec = 1.15
3535
protobuf = 3.25.5
3636

3737
# test dependencies
38-
randomizedrunner = 2.8.0
38+
randomizedrunner = 2.8.2
3939
junit = 4.13.2
4040
junit5 = 5.7.1
4141
hamcrest = 2.1

‎dev-tools/publish_zstd_binaries.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ build_linux_jar() {
7979
}
8080

8181
echo 'Building Linux jars...'
82-
LINUX_ARM_JAR=$(build_linux_jar "linux/amd64" "x86-64")
83-
LINUX_X86_JAR=$(build_linux_jar "linux/arm64" "aarch64")
82+
LINUX_ARM_JAR=$(build_linux_jar "linux/arm64" "aarch64")
83+
LINUX_X86_JAR=$(build_linux_jar "linux/amd64" "x86-64")
8484

8585
build_windows_jar() {
8686
ARTIFACT="$TEMP/zstd-$VERSION-windows-x86-64.jar"

‎distribution/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ tasks.register("generateDependenciesReport", ConcatFilesTask) {
7070
// Explicitly add the dependency on the RHEL UBI Docker base image
7171
String[] rhelUbiFields = [
7272
'Red Hat Universal Base Image minimal',
73-
'8',
74-
'https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8',
73+
'9',
74+
'https://catalog.redhat.com/software/containers/ubi9-minimal/61832888c0d15aff4912fe0d',
7575
'Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf',
76-
'https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz'
76+
'https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz'
7777
]
7878
additionalLines << rhelUbiFields.join(',')
7979
}

‎docs/changelog/117555.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117555
2+
summary: Expand type compatibility for match function and operator
3+
area: ES|QL
4+
type: feature
5+
issues: []

‎docs/changelog/117575.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117575
2+
summary: Fix enrich cache size setting name
3+
area: Ingest Node
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)