Skip to content

Commit fa415d8

Browse files
jonathan-buttnerjonathan-buttner
committed
Merge branch 'main' of github.com:elastic/elasticsearch into ml-inference-unified-api-elastic
2 parents 41f9bce + f2addbc commit fa415d8

File tree

542 files changed

+15456
-6522
lines changed

Some content is hidden

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

542 files changed

+15456
-6522
lines changed

‎.buildkite/hooks/pre-command‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ export GRADLE_BUILD_CACHE_PASSWORD
4747
BUILDKITE_API_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/buildkite-api-token)
4848
export BUILDKITE_API_TOKEN
4949

50+
export GH_TOKEN="$VAULT_GITHUB_TOKEN"
51+
5052
if [[ "${USE_LUCENE_SNAPSHOT_CREDS:-}" == "true" ]]; then
5153
data=$(.buildkite/scripts/get-legacy-secret.sh aws-elastic/creds/lucene-snapshots)
5254

@@ -117,3 +119,5 @@ if [[ -f /etc/os-release ]] && grep -q '"Amazon Linux 2"' /etc/os-release; then
117119
echo "$(hostname -i | cut -d' ' -f 2) $(hostname -f)." | sudo tee /etc/dnsmasq.hosts
118120
sudo systemctl restart dnsmasq.service
119121
fi
122+
123+
.buildkite/scripts/get-latest-test-mutes.sh

‎.buildkite/hooks/pre-command.bat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ set BUILD_NUMBER=%BUILDKITE_BUILD_NUMBER%
1515
set COMPOSE_HTTP_TIMEOUT=120
1616
set JOB_BRANCH=%BUILDKITE_BRANCH%
1717

18+
set GH_TOKEN=%VAULT_GITHUB_TOKEN%
19+
1820
set GRADLE_BUILD_CACHE_USERNAME=vault read -field=username secret/ci/elastic-elasticsearch/migrated/gradle-build-cache
1921
set GRADLE_BUILD_CACHE_PASSWORD=vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache
2022

2123
bash.exe -c "nohup bash .buildkite/scripts/setup-monitoring.sh </dev/null >/dev/null 2>&1 &"
24+
bash.exe -c "bash .buildkite/scripts/get-latest-test-mutes.sh"
2225

2326
exit /b 0

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- label: sanity-check
3-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
@@ -9,39 +9,39 @@ steps:
99
buildDirectory: /dev/shm/bk
1010
- wait
1111
- label: part1
12-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
12+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
1616
image: family/elasticsearch-ubuntu-2004
1717
machineType: n1-standard-32
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
20-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
20+
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
2424
image: family/elasticsearch-ubuntu-2004
2525
machineType: n1-standard-32
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
28-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
28+
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
3232
image: family/elasticsearch-ubuntu-2004
3333
machineType: n1-standard-32
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
36-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
36+
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
4040
image: family/elasticsearch-ubuntu-2004
4141
machineType: n1-standard-32
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
44-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
44+
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
@@ -51,7 +51,7 @@ steps:
5151
- group: bwc-snapshots
5252
steps:
5353
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
54-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
54+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5555
timeout_in_minutes: 300
5656
matrix:
5757
setup:
@@ -64,7 +64,7 @@ steps:
6464
env:
6565
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6666
- label: rest-compat
67-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
67+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6868
timeout_in_minutes: 300
6969
agents:
7070
provider: gcp

‎.buildkite/pipelines/intake.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto-generated. See .buildkite/pipelines/intake.template.yml
22
steps:
33
- label: sanity-check
4-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
4+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
@@ -10,39 +10,39 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
- wait
1212
- label: part1
13-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
13+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1414
timeout_in_minutes: 300
1515
agents:
1616
provider: gcp
1717
image: family/elasticsearch-ubuntu-2004
1818
machineType: n1-standard-32
1919
buildDirectory: /dev/shm/bk
2020
- label: part2
21-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
21+
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
2525
image: family/elasticsearch-ubuntu-2004
2626
machineType: n1-standard-32
2727
buildDirectory: /dev/shm/bk
2828
- label: part3
29-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
29+
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
3333
image: family/elasticsearch-ubuntu-2004
3434
machineType: n1-standard-32
3535
buildDirectory: /dev/shm/bk
3636
- label: part4
37-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
37+
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
4141
image: family/elasticsearch-ubuntu-2004
4242
machineType: n1-standard-32
4343
buildDirectory: /dev/shm/bk
4444
- label: part5
45-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
45+
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
@@ -52,7 +52,7 @@ steps:
5252
- group: bwc-snapshots
5353
steps:
5454
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
55-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
55+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
@@ -65,7 +65,7 @@ steps:
6565
env:
6666
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6767
- label: rest-compat
68-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
68+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6969
timeout_in_minutes: 300
7070
agents:
7171
provider: gcp

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- label: sanity-check
3-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
@@ -9,39 +9,39 @@ steps:
99
buildDirectory: /dev/shm/bk
1010
- wait: null
1111
- label: part1
12-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
12+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
1616
image: family/elasticsearch-ubuntu-2004
1717
machineType: custom-32-98304
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
20-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
20+
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
2424
image: family/elasticsearch-ubuntu-2004
2525
machineType: custom-32-98304
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
28-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
28+
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
3232
image: family/elasticsearch-ubuntu-2004
3333
machineType: custom-32-98304
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
36-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
36+
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
4040
image: family/elasticsearch-ubuntu-2004
4141
machineType: custom-32-98304
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
44-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
44+
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
@@ -51,7 +51,7 @@ steps:
5151
- group: bwc-snapshots
5252
steps:
5353
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
54-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
54+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5555
timeout_in_minutes: 300
5656
matrix:
5757
setup:
@@ -66,7 +66,7 @@ steps:
6666
env:
6767
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6868
- label: rest-compat
69-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
69+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
7070
timeout_in_minutes: 300
7171
agents:
7272
provider: gcp

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ steps:
273273
env:
274274
BWC_VERSION: 8.14.3
275275

276-
- label: "{{matrix.image}} / 8.15.4 / packaging-tests-upgrade"
277-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.4
276+
- label: "{{matrix.image}} / 8.15.6 / packaging-tests-upgrade"
277+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.6
278278
timeout_in_minutes: 300
279279
matrix:
280280
setup:
@@ -287,7 +287,7 @@ steps:
287287
machineType: custom-16-32768
288288
buildDirectory: /dev/shm/bk
289289
env:
290-
BWC_VERSION: 8.15.4
290+
BWC_VERSION: 8.15.6
291291

292292
- label: "{{matrix.image}} / 8.16.2 / packaging-tests-upgrade"
293293
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.2

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ steps:
287287
- signal_reason: agent_stop
288288
limit: 3
289289

290-
- label: 8.15.4 / bwc
291-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.4#bwcTest
290+
- label: 8.15.6 / bwc
291+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.6#bwcTest
292292
timeout_in_minutes: 300
293293
agents:
294294
provider: gcp
@@ -297,7 +297,7 @@ steps:
297297
buildDirectory: /dev/shm/bk
298298
preemptible: true
299299
env:
300-
BWC_VERSION: 8.15.4
300+
BWC_VERSION: 8.15.6
301301
retry:
302302
automatic:
303303
- exit_status: "-1"

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ find "$WORKSPACE" -type d -path "*/build/distributions" -exec chmod a+w {} \;
7575

7676
echo --- Running release-manager
7777

78-
set +e
7978
# Artifacts should be generated
8079
docker run --rm \
8180
--name release-manager \
@@ -92,16 +91,4 @@ docker run --rm \
9291
--version "$ES_VERSION" \
9392
--artifact-set main \
9493
--dependency "beats:https://artifacts-${WORKFLOW}.elastic.co/beats/${BEATS_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"
94+
--dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json"

‎.buildkite/scripts/get-latest-test-mutes.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
3+
if [[ ! "${BUILDKITE_PULL_REQUEST:-}" || "${BUILDKITE_AGENT_META_DATA_PROVIDER:-}" == "k8s" ]]; then
4+
exit 0
5+
fi
6+
7+
testMuteBranch="${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-main}"
8+
testMuteFile="$(mktemp)"
9+
10+
# If this PR contains changes to muted-tests.yml, we disable this functionality
11+
# Otherwise, we wouldn't be able to test unmutes
12+
if [[ ! $(gh pr diff "$BUILDKITE_PULL_REQUEST" --name-only | grep 'muted-tests.yml') ]]; then
13+
gh api -H 'Accept: application/vnd.github.v3.raw' "repos/elastic/elasticsearch/contents/muted-tests.yml?ref=$testMuteBranch" > "$testMuteFile"
14+
15+
if [[ -s "$testMuteFile" ]]; then
16+
mkdir -p ~/.gradle
17+
# This is using gradle.properties instead of an env var so that it's easily compatible with the Windows pre-command hook
18+
echo "org.gradle.project.org.elasticsearch.additional.muted.tests=$testMuteFile" >> ~/.gradle/gradle.properties
19+
fi
20+
fi

‎.buildkite/scripts/gradle-build-cache-validation.sh‎

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

33
set -euo pipefail
44

5-
VALIDATION_SCRIPTS_VERSION=2.5.1
5+
VALIDATION_SCRIPTS_VERSION=2.7.1
66
GRADLE_ENTERPRISE_ACCESS_KEY=$(vault kv get -field=value secret/ci/elastic-elasticsearch/gradle-enterprise-api-key)
77
export GRADLE_ENTERPRISE_ACCESS_KEY
8-
9-
curl -s -L -O https://github.com/gradle/gradle-enterprise-build-validation-scripts/releases/download/v$VALIDATION_SCRIPTS_VERSION/gradle-enterprise-gradle-build-validation-$VALIDATION_SCRIPTS_VERSION.zip && unzip -q -o gradle-enterprise-gradle-build-validation-$VALIDATION_SCRIPTS_VERSION.zip
8+
curl -s -L -O https://github.com/gradle/gradle-enterprise-build-validation-scripts/releases/download/v$VALIDATION_SCRIPTS_VERSION/develocity-gradle-build-validation-$VALIDATION_SCRIPTS_VERSION.zip && unzip -q -o develocity-gradle-build-validation-$VALIDATION_SCRIPTS_VERSION.zip
109

1110
# Create a temporary file
1211
tmpOutputFile=$(mktemp)
1312
trap "rm $tmpOutputFile" EXIT
1413

1514
set +e
16-
gradle-enterprise-gradle-build-validation/03-validate-local-build-caching-different-locations.sh -r https://github.com/elastic/elasticsearch.git -b $BUILDKITE_BRANCH --gradle-enterprise-server https://gradle-enterprise.elastic.co -t precommit --fail-if-not-fully-cacheable | tee $tmpOutputFile
15+
develocity-gradle-build-validation/03-validate-local-build-caching-different-locations.sh -r https://github.com/elastic/elasticsearch.git -b $BUILDKITE_BRANCH --develocity-server https://gradle-enterprise.elastic.co -t precommit --fail-if-not-fully-cacheable | tee $tmpOutputFile
1716
# Capture the return value
1817
retval=$?
1918
set -e

0 commit comments

Comments
 (0)