Skip to content

Commit 028c2f2

Browse files
committed
Merge branch 'main' into carlosdelest/search-serverless-metrics-listener
2 parents 7c49cda + 64c362b commit 028c2f2

File tree

1,402 files changed

+43509
-29479
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,402 files changed

+43509
-29479
lines changed

.buildkite/packer_cache.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ for branch in "${branches[@]}"; do
2929
fi
3030

3131
export JAVA_HOME="$HOME/.java/$ES_BUILD_JAVA"
32-
"checkout/${branch}/gradlew" --project-dir "$CHECKOUT_DIR" --parallel -s resolveAllDependencies -Dorg.gradle.warning.mode=none -DisCI
32+
"checkout/${branch}/gradlew" --project-dir "$CHECKOUT_DIR" --parallel -s resolveAllDependencies -Dorg.gradle.warning.mode=none -DisCI --max-workers=4
33+
"checkout/${branch}/gradlew" --stop
34+
pkill -f '.*GradleDaemon.*'
3335
rm -rf "checkout/${branch}"
3436
done

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ steps:
4040
matrix:
4141
setup:
4242
image:
43-
- windows-2016
44-
- windows-2019
4543
- windows-2022
4644
agents:
4745
provider: gcp

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,6 @@ steps:
345345
matrix:
346346
setup:
347347
image:
348-
- windows-2016
349-
- windows-2019
350348
- windows-2022
351349
agents:
352350
provider: gcp

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ steps:
3838
matrix:
3939
setup:
4040
image:
41-
- windows-2016
42-
- windows-2019
4341
- windows-2022
4442
GRADLE_TASK:
4543
- checkPart1

.buildkite/pipelines/pull-request/packaging-tests-windows-sample.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
matrix:
1313
setup:
1414
image:
15-
- windows-2019
15+
- windows-2022
1616
PACKAGING_TASK:
1717
- default-windows-archive
1818
agents:

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ steps:
1010
matrix:
1111
setup:
1212
image:
13-
- windows-2016
14-
- windows-2019
1513
- windows-2022
1614
PACKAGING_TASK:
1715
- default-windows-archive

.buildkite/scripts/cloud-deploy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
set -euo pipefail
44

5-
.ci/scripts/run-gradle.sh buildCloudDockerImage
5+
.ci/scripts/run-gradle.sh buildCloudEssDockerImage
66

77
ES_VERSION=$(grep 'elasticsearch' build-tools-internal/version.properties | awk '{print $3}')
8-
DOCKER_TAG="docker.elastic.co/elasticsearch-ci/elasticsearch-cloud:${ES_VERSION}-${BUILDKITE_COMMIT:0:7}"
9-
docker tag elasticsearch-cloud:test "$DOCKER_TAG"
8+
DOCKER_TAG="docker.elastic.co/elasticsearch-ci/elasticsearch-cloud-ess:${ES_VERSION}-${BUILDKITE_COMMIT:0:7}"
9+
docker tag elasticsearch-cloud-ess:test "$DOCKER_TAG"
1010

1111
echo "$DOCKER_REGISTRY_PASSWORD" | docker login -u "$DOCKER_REGISTRY_USERNAME" --password-stdin docker.elastic.co
1212
unset DOCKER_REGISTRY_USERNAME DOCKER_REGISTRY_PASSWORD

.ci/dockerOnLinuxExclusions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ sles-15.2
1515
sles-15.3
1616
sles-15.4
1717
sles-15.5
18+
sles-15.6
1819

1920
# These OSes are deprecated and filtered starting with 8.0.0, but need to be excluded
2021
# for PR checks

.github/CODEOWNERS

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@ server/src/main/java/org/elasticsearch/bootstrap @elastic/es-core-infra
6565
server/src/main/java/org/elasticsearch/node @elastic/es-core-infra
6666
server/src/main/java/org/elasticsearch/plugins @elastic/es-core-infra
6767
server/src/main/java/org/elasticsearch/threadpool @elastic/es-core-infra
68+
server/src/main/java/org/elasticsearch/common/breaker @elastic/es-core-infra
69+
server/src/main/java/org/elasticsearch/common/bytes @elastic/es-core-infra
70+
server/src/main/java/org/elasticsearch/common/cli @elastic/es-core-infra
71+
server/src/main/java/org/elasticsearch/common/collect @elastic/es-core-infra
72+
server/src/main/java/org/elasticsearch/common/component @elastic/es-core-infra
73+
server/src/main/java/org/elasticsearch/common/compress @elastic/es-core-infra
74+
server/src/main/java/org/elasticsearch/common/document @elastic/es-core-infra
75+
server/src/main/java/org/elasticsearch/common/file @elastic/es-core-infra
76+
server/src/main/java/org/elasticsearch/common/hash @elastic/es-core-infra
77+
server/src/main/java/org/elasticsearch/common/io @elastic/es-core-infra
78+
server/src/main/java/org/elasticsearch/common/logging @elastic/es-core-infra
79+
server/src/main/java/org/elasticsearch/common/metrics @elastic/es-core-infra
80+
server/src/main/java/org/elasticsearch/common/network @elastic/es-core-infra
81+
server/src/main/java/org/elasticsearch/common/path @elastic/es-core-infra
82+
server/src/main/java/org/elasticsearch/common/recycler @elastic/es-core-infra
83+
server/src/main/java/org/elasticsearch/common/regex @elastic/es-core-infra
84+
server/src/main/java/org/elasticsearch/common/scheduler @elastic/es-core-infra
85+
server/src/main/java/org/elasticsearch/common/settings @elastic/es-core-infra
86+
server/src/main/java/org/elasticsearch/common/text @elastic/es-core-infra
87+
server/src/main/java/org/elasticsearch/common/time @elastic/es-core-infra
88+
server/src/main/java/org/elasticsearch/common/transport @elastic/es-core-infra
89+
server/src/main/java/org/elasticsearch/common/unit @elastic/es-core-infra
90+
server/src/main/java/org/elasticsearch/common/util @elastic/es-core-infra
91+
server/src/main/java/org/elasticsearch/common/xcontent @elastic/es-core-infra
6892

6993
# Security
7094
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege @elastic/es-security

.github/workflows/sync-main-to-jdk-branch.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)