Skip to content

Commit 495308b

Browse files
drempapisdrempapis
authored
Merge branch '9.0' into backport/9.0/pr-124918
2 parents 38cf4af + 31cad16 commit 495308b

File tree

3,543 files changed

+64899
-25523
lines changed

Some content is hidden

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

3,543 files changed

+64899
-25523
lines changed

‎.backportrc.json‎

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

‎.buildkite/hooks/pre-command‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ if [[ "${USE_LUCENE_SNAPSHOT_CREDS:-}" == "true" ]]; then
6464
unset data
6565
fi
6666

67+
if [[ "${USE_MAVEN_GPG:-}" == "true" ]]; then
68+
vault_path="kv/ci-shared/release-eng/team-release-secrets/es-delivery/gpg"
69+
ORG_GRADLE_PROJECT_signingKey=$(vault kv get --field="private_key" $vault_path)
70+
ORG_GRADLE_PROJECT_signingPassword=$(vault kv get --field="passphase" $vault_path)
71+
export ORG_GRADLE_PROJECT_signingKey
72+
export ORG_GRADLE_PROJECT_signingPassword
73+
fi
74+
6775
if [[ "${USE_DRA_CREDENTIALS:-}" == "true" ]]; then
6876
DRA_VAULT_ROLE_ID_SECRET=$(vault read -field=role-id secret/ci/elastic-elasticsearch/legacy-vault-credentials)
6977
export DRA_VAULT_ROLE_ID_SECRET
@@ -94,6 +102,14 @@ if [[ "${USE_PROD_DOCKER_CREDENTIALS:-}" == "true" ]]; then
94102
fi
95103
fi
96104

105+
# Authenticate to the Docker Hub public read-only registry
106+
if which docker > /dev/null 2>&1; then
107+
DOCKERHUB_REGISTRY_USERNAME="$(vault read -field=username secret/ci/elastic-elasticsearch/docker_hub_public_ro_credentials)"
108+
DOCKERHUB_REGISTRY_PASSWORD="$(vault read -field=password secret/ci/elastic-elasticsearch/docker_hub_public_ro_credentials)"
109+
110+
echo "$DOCKERHUB_REGISTRY_PASSWORD" | docker login --username "$DOCKERHUB_REGISTRY_USERNAME" --password-stdin docker.io
111+
fi
112+
97113
if [[ "$BUILDKITE_AGENT_META_DATA_PROVIDER" != *"k8s"* ]]; then
98114
# Run in the background, while the job continues
99115
nohup .buildkite/scripts/setup-monitoring.sh </dev/null >/dev/null 2>&1 &

‎.buildkite/pipelines/dra-workflow.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ steps:
22
- command: .buildkite/scripts/dra-workflow.sh
33
env:
44
USE_DRA_CREDENTIALS: "true"
5+
USE_MAVEN_GPG: "true"
56
USE_PROD_DOCKER_CREDENTIALS: "true"
67
agents:
78
provider: gcp

‎.buildkite/pipelines/ecs-dynamic-template-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 420
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
diskSizeGb: 350
99
machineType: custom-32-98304
1010
notify:

‎.buildkite/pipelines/intake.template.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
machineType: custom-32-98304
99
buildDirectory: /dev/shm/bk
1010
- wait
@@ -13,39 +13,39 @@ steps:
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
16-
image: family/elasticsearch-ubuntu-2004
16+
image: family/elasticsearch-ubuntu-2404
1717
machineType: n1-standard-32
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
2020
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
24-
image: family/elasticsearch-ubuntu-2004
24+
image: family/elasticsearch-ubuntu-2404
2525
machineType: n1-standard-32
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
2828
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
2929
timeout_in_minutes: 300
3030
agents:
3131
provider: gcp
32-
image: family/elasticsearch-ubuntu-2004
32+
image: family/elasticsearch-ubuntu-2404
3333
machineType: n1-standard-32
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
3636
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3737
timeout_in_minutes: 300
3838
agents:
3939
provider: gcp
40-
image: family/elasticsearch-ubuntu-2004
40+
image: family/elasticsearch-ubuntu-2404
4141
machineType: n1-standard-32
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
4444
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4545
timeout_in_minutes: 300
4646
agents:
4747
provider: gcp
48-
image: family/elasticsearch-ubuntu-2004
48+
image: family/elasticsearch-ubuntu-2404
4949
machineType: n1-standard-32
5050
buildDirectory: /dev/shm/bk
5151
- group: bwc-snapshots
@@ -58,11 +58,13 @@ steps:
5858
BWC_VERSION: $BWC_LIST
5959
agents:
6060
provider: gcp
61-
image: family/elasticsearch-ubuntu-2004
61+
image: family/elasticsearch-ubuntu-2404
6262
machineType: custom-32-98304
6363
buildDirectory: /dev/shm/bk
6464
env:
6565
BWC_VERSION: "{{matrix.BWC_VERSION}}"
66+
- label: bc-upgrade
67+
command: ".buildkite/scripts/run-bc-upgrade-tests.sh"
6668
- group: lucene-compat
6769
steps:
6870
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
@@ -78,7 +80,7 @@ steps:
7880
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
7981
agents:
8082
provider: gcp
81-
image: family/elasticsearch-ubuntu-2004
83+
image: family/elasticsearch-ubuntu-2404
8284
machineType: custom-32-98304
8385
buildDirectory: /dev/shm/bk
8486
env:
@@ -89,7 +91,7 @@ steps:
8991
timeout_in_minutes: 300
9092
agents:
9193
provider: gcp
92-
image: family/elasticsearch-ubuntu-2004
94+
image: family/elasticsearch-ubuntu-2404
9395
machineType: custom-32-98304
9496
buildDirectory: /dev/shm/bk
9597
- wait

‎.buildkite/pipelines/intake.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
8-
image: family/elasticsearch-ubuntu-2004
8+
image: family/elasticsearch-ubuntu-2404
99
machineType: custom-32-98304
1010
buildDirectory: /dev/shm/bk
1111
- wait
@@ -14,39 +14,39 @@ steps:
1414
timeout_in_minutes: 300
1515
agents:
1616
provider: gcp
17-
image: family/elasticsearch-ubuntu-2004
17+
image: family/elasticsearch-ubuntu-2404
1818
machineType: n1-standard-32
1919
buildDirectory: /dev/shm/bk
2020
- label: part2
2121
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2222
timeout_in_minutes: 300
2323
agents:
2424
provider: gcp
25-
image: family/elasticsearch-ubuntu-2004
25+
image: family/elasticsearch-ubuntu-2404
2626
machineType: n1-standard-32
2727
buildDirectory: /dev/shm/bk
2828
- label: part3
2929
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
3030
timeout_in_minutes: 300
3131
agents:
3232
provider: gcp
33-
image: family/elasticsearch-ubuntu-2004
33+
image: family/elasticsearch-ubuntu-2404
3434
machineType: n1-standard-32
3535
buildDirectory: /dev/shm/bk
3636
- label: part4
3737
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3838
timeout_in_minutes: 300
3939
agents:
4040
provider: gcp
41-
image: family/elasticsearch-ubuntu-2004
41+
image: family/elasticsearch-ubuntu-2404
4242
machineType: n1-standard-32
4343
buildDirectory: /dev/shm/bk
4444
- label: part5
4545
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4646
timeout_in_minutes: 300
4747
agents:
4848
provider: gcp
49-
image: family/elasticsearch-ubuntu-2004
49+
image: family/elasticsearch-ubuntu-2404
5050
machineType: n1-standard-32
5151
buildDirectory: /dev/shm/bk
5252
- group: bwc-snapshots
@@ -56,14 +56,16 @@ steps:
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
59-
BWC_VERSION: ["8.16.6", "8.17.4", "8.18.0", "9.0.0"]
59+
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5"]
6060
agents:
6161
provider: gcp
62-
image: family/elasticsearch-ubuntu-2004
62+
image: family/elasticsearch-ubuntu-2404
6363
machineType: custom-32-98304
6464
buildDirectory: /dev/shm/bk
6565
env:
6666
BWC_VERSION: "{{matrix.BWC_VERSION}}"
67+
- label: bc-upgrade
68+
command: ".buildkite/scripts/run-bc-upgrade-tests.sh"
6769
- group: lucene-compat
6870
steps:
6971
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
@@ -79,7 +81,7 @@ steps:
7981
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
8082
agents:
8183
provider: gcp
82-
image: family/elasticsearch-ubuntu-2004
84+
image: family/elasticsearch-ubuntu-2404
8385
machineType: custom-32-98304
8486
buildDirectory: /dev/shm/bk
8587
env:
@@ -90,7 +92,7 @@ steps:
9092
timeout_in_minutes: 300
9193
agents:
9294
provider: gcp
93-
image: family/elasticsearch-ubuntu-2004
95+
image: family/elasticsearch-ubuntu-2404
9496
machineType: custom-32-98304
9597
buildDirectory: /dev/shm/bk
9698
- wait

‎.buildkite/pipelines/lucene-snapshot/build-snapshot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
UPDATE_ES_LUCENE_SNAPSHOT: "true"
1313
agents:
1414
provider: gcp
15-
image: family/elasticsearch-ubuntu-2004
15+
image: family/elasticsearch-ubuntu-2404
1616
machineType: custom-32-98304
1717
buildDirectory: /dev/shm/bk
1818
- wait

‎.buildkite/pipelines/lucene-snapshot/run-tests.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
machineType: custom-32-98304
99
buildDirectory: /dev/shm/bk
1010
- wait: null
@@ -13,39 +13,39 @@ steps:
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
16-
image: family/elasticsearch-ubuntu-2004
16+
image: family/elasticsearch-ubuntu-2404
1717
machineType: custom-32-98304
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
2020
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
24-
image: family/elasticsearch-ubuntu-2004
24+
image: family/elasticsearch-ubuntu-2404
2525
machineType: custom-32-98304
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
2828
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
2929
timeout_in_minutes: 300
3030
agents:
3131
provider: gcp
32-
image: family/elasticsearch-ubuntu-2004
32+
image: family/elasticsearch-ubuntu-2404
3333
machineType: custom-32-98304
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
3636
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3737
timeout_in_minutes: 300
3838
agents:
3939
provider: gcp
40-
image: family/elasticsearch-ubuntu-2004
40+
image: family/elasticsearch-ubuntu-2404
4141
machineType: custom-32-98304
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
4444
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4545
timeout_in_minutes: 300
4646
agents:
4747
provider: gcp
48-
image: family/elasticsearch-ubuntu-2004
48+
image: family/elasticsearch-ubuntu-2404
4949
machineType: custom-32-98304
5050
buildDirectory: /dev/shm/bk
5151
- group: bwc-snapshots
@@ -60,7 +60,7 @@ steps:
6060
- 8.10.0
6161
agents:
6262
provider: gcp
63-
image: family/elasticsearch-ubuntu-2004
63+
image: family/elasticsearch-ubuntu-2404
6464
machineType: custom-32-98304
6565
buildDirectory: /dev/shm/bk
6666
env:
@@ -70,6 +70,6 @@ steps:
7070
timeout_in_minutes: 300
7171
agents:
7272
provider: gcp
73-
image: family/elasticsearch-ubuntu-2004
73+
image: family/elasticsearch-ubuntu-2404
7474
machineType: custom-32-98304
7575
buildDirectory: /dev/shm/bk

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
machineType: n1-standard-32
99
buildDirectory: /dev/shm/bk
1010
matrix:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ steps:
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
8-
image: family/elasticsearch-ubuntu-2004
8+
image: family/elasticsearch-ubuntu-2404
99
machineType: n1-standard-32
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: []
13+
FWC_VERSION: ["9.0.0", "9.0.1", "9.0.2", "9.0.3", "9.0.4"]
1414
env:
1515
FWC_VERSION: $FWC_VERSION

0 commit comments

Comments
 (0)