Skip to content

Commit 0d0b484

Browse files
thecoopthecoop
committed
Merge remote-tracking branch 'upstream/lucene_snapshot_10_3' into direct-io-index-option
2 parents 15f7f4c + b513749 commit 0d0b484

File tree

3,811 files changed

+136384
-51780
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,811 files changed

+136384
-51780
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.18.6", "8.19.3", "9.0.6", "9.1.3", "9.2.0"]
68+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/java-ea-check-new-build.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- command: .buildkite/scripts/trigger-if-java-ea-new-build.sh
3+
env:
4+
RECENT_TIME_WINDOW: "24" # time window to consider a build as new in hours
5+
agents:
6+
image: "docker.elastic.co/ci-agent-images/eck-region/buildkite-agent:1.15"
7+
memory: "4G"

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ steps:
22
- trigger: apache-lucene-build-snapshot
33
label: Trigger pipeline to build lucene snapshot
44
key: lucene-build
5-
if: (build.env("LUCENE_BUILD_ID") == null || build.env("LUCENE_BUILD_ID") == "")
6-
build:
7-
branch: branch_10x
5+
if: build.env("LUCENE_BUILD_ID") == null || build.env("LUCENE_BUILD_ID") == ""
86
- wait
97
- label: Upload and update lucene snapshot
108
command: .buildkite/scripts/lucene-snapshot/upload-snapshot.sh

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
2-
- label: $FWC_VERSION / fwc
3-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
2+
- label: "{{matrix.FWC_VERSION}} / fwc"
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
@@ -11,4 +11,4 @@ steps:
1111
setup:
1212
FWC_VERSION: $FWC_LIST
1313
env:
14-
FWC_VERSION: $FWC_VERSION
14+
FWC_VERSION: "{{matrix.FWC_VERSION}}"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto-generated. See .buildkite/pipelines/periodic-fwc.template.yml
22
steps:
3-
- label: $FWC_VERSION / fwc
4-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
3+
- label: "{{matrix.FWC_VERSION}} / fwc"
4+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
@@ -12,4 +12,4 @@ steps:
1212
setup:
1313
FWC_VERSION: []
1414
env:
15-
FWC_VERSION: $FWC_VERSION
15+
FWC_VERSION: "{{matrix.FWC_VERSION}}"

‎.buildkite/pipelines/periodic-java-ea.bwc.template.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
- label: $BWC_VERSION / bwc
2+
command: .ci/scripts/run-gradle.sh -Druntime.java=\$\$JAVA_EA_VERSION -Dbwc.checkout.align=true v$BWC_VERSION#bwcTest
3+
timeout_in_minutes: 300
4+
agents:
5+
provider: gcp
6+
image: family/elasticsearch-ubuntu-2404
7+
machineType: n1-standard-32
8+
buildDirectory: /dev/shm/bk
9+
preemptible: true
10+
env:
11+
BWC_VERSION: $BWC_VERSION
12+
retry:
13+
automatic:
14+
- exit_status: "-1"
15+
limit: 3
16+
signal_reason: none
17+
- signal_reason: agent_stop
18+
limit: 3

‎.buildkite/pipelines/periodic-java-ea.template.yml‎

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
env:
2+
JAVA_EA_VERSION: "${JAVA_EA_VERSION:-26-pre}"
3+
4+
steps:
5+
- group: bwc
6+
steps: $BWC_STEPS
7+
- label: concurrent-search-tests
8+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
9+
timeout_in_minutes: 420
10+
agents:
11+
provider: gcp
12+
image: family/elasticsearch-ubuntu-2404
13+
diskSizeGb: 350
14+
machineType: custom-32-98304
15+
- label: encryption-at-rest
16+
command: .buildkite/scripts/encryption-at-rest.sh -Druntime.java=$$JAVA_EA_VERSION
17+
timeout_in_minutes: 420
18+
agents:
19+
provider: gcp
20+
image: family/elasticsearch-ubuntu-2404
21+
diskSizeGb: 350
22+
machineType: custom-32-98304
23+
- label: eql-correctness
24+
command: .buildkite/scripts/eql-correctness.sh -Druntime.java=$$JAVA_EA_VERSION
25+
timeout_in_minutes: 300
26+
agents:
27+
provider: gcp
28+
image: family/elasticsearch-ubuntu-2404
29+
machineType: custom-32-98304
30+
buildDirectory: /dev/shm/bk
31+
- group: java-matrix
32+
steps:
33+
- label: "{{matrix.GRADLE_TASK}} / {{matrix.image}} "
34+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true $$GRADLE_TASK
35+
timeout_in_minutes: 300
36+
matrix:
37+
setup:
38+
image:
39+
- ubuntu-2404
40+
GRADLE_TASK:
41+
- checkPart1
42+
- checkPart2
43+
- checkPart3
44+
- checkPart4
45+
- checkPart5
46+
- checkPart6
47+
- checkRestCompat
48+
agents:
49+
provider: gcp
50+
image: family/elasticsearch-{{matrix.image}}
51+
machineType: n1-standard-32
52+
buildDirectory: /dev/shm/bk
53+
env:
54+
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
55+
- label: "{{matrix.GRADLE_TASK}} / {{matrix.image}} "
56+
command: |
57+
.\.buildkite\scripts\run-script.ps1 bash .buildkite/scripts/windows-run-gradle.sh
58+
timeout_in_minutes: 300
59+
matrix:
60+
setup:
61+
image:
62+
- windows-2025
63+
GRADLE_TASK:
64+
- checkPart1
65+
- checkPart2
66+
- checkPart3
67+
- checkPart4
68+
- checkPart5
69+
- checkPart6
70+
- checkRestCompat
71+
agents:
72+
provider: gcp
73+
image: family/elasticsearch-{{matrix.image}}
74+
machineType: n1-standard-32
75+
buildDirectory: /dev/shm/bk
76+
env:
77+
GRADLE_PARAMS: "-Druntime.java=$$JAVA_EA_VERSION"
78+
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
79+
- label: "{{matrix.BWC_VERSION}} / matrix-bwc"
80+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
81+
timeout_in_minutes: 300
82+
matrix:
83+
setup:
84+
BWC_VERSION: $BWC_LIST
85+
agents:
86+
provider: gcp
87+
image: family/elasticsearch-ubuntu-2404
88+
machineType: n1-standard-32
89+
buildDirectory: /dev/shm/bk
90+
env:
91+
BWC_VERSION: "{{matrix.BWC_VERSION}}"
92+
- label: release-tests
93+
command: .buildkite/scripts/release-tests.sh
94+
timeout_in_minutes: 360
95+
agents:
96+
provider: gcp
97+
image: family/elasticsearch-ubuntu-2404
98+
diskSizeGb: 350
99+
machineType: custom-32-98304
100+
- label: single-processor-node-tests
101+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true -Dtests.configure_test_clusters_with_one_processor=true functionalTests
102+
timeout_in_minutes: 420
103+
agents:
104+
provider: gcp
105+
image: family/elasticsearch-ubuntu-2404
106+
diskSizeGb: 350
107+
machineType: custom-32-98304
108+
- group: third-party tests
109+
steps:
110+
- label: third-party / azure-sas
111+
command: |
112+
export azure_storage_container=elasticsearch-ci-thirdparty-sas
113+
export azure_storage_base_path=$BUILDKITE_BRANCH
114+
115+
.ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION azureThirdPartyTest
116+
env:
117+
USE_3RD_PARTY_AZURE_SAS_CREDENTIALS: "true"
118+
timeout_in_minutes: 30
119+
agents:
120+
provider: gcp
121+
image: family/elasticsearch-ubuntu-2404
122+
machineType: n2-standard-8
123+
buildDirectory: /dev/shm/bk
124+
- label: third-party / azure
125+
command: |
126+
export azure_storage_container=elasticsearch-ci-thirdparty
127+
export azure_storage_base_path=$BUILDKITE_BRANCH
128+
129+
.ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION azureThirdPartyTest
130+
env:
131+
USE_3RD_PARTY_AZURE_CREDENTIALS: "true"
132+
timeout_in_minutes: 30
133+
agents:
134+
provider: gcp
135+
image: family/elasticsearch-ubuntu-2404
136+
machineType: n2-standard-8
137+
buildDirectory: /dev/shm/bk
138+
- label: third-party / gcs
139+
command: |
140+
export google_storage_bucket=elasticsearch-ci-thirdparty
141+
export google_storage_base_path=$BUILDKITE_BRANCH
142+
143+
.ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION gcsThirdPartyTest
144+
env:
145+
USE_3RD_PARTY_GCS_CREDENTIALS: "true"
146+
timeout_in_minutes: 30
147+
agents:
148+
provider: gcp
149+
image: family/elasticsearch-ubuntu-2404
150+
machineType: n2-standard-8
151+
buildDirectory: /dev/shm/bk
152+
- label: third-party / geoip
153+
command: |
154+
.ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION :modules:ingest-geoip:internalClusterTest -Dtests.jvm.argline="-Dgeoip_use_service=true"
155+
timeout_in_minutes: 30
156+
agents:
157+
provider: gcp
158+
image: family/elasticsearch-ubuntu-2404
159+
machineType: n2-standard-8
160+
buildDirectory: /dev/shm/bk
161+
- label: third-party / s3
162+
command: |
163+
export amazon_s3_bucket=elasticsearch-ci.us-west-2
164+
export amazon_s3_base_path=$BUILDKITE_BRANCH
165+
166+
.ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION s3ThirdPartyTest
167+
env:
168+
USE_3RD_PARTY_S3_CREDENTIALS: "true"
169+
timeout_in_minutes: 30
170+
agents:
171+
provider: gcp
172+
image: family/elasticsearch-ubuntu-2404
173+
machineType: n2-standard-8
174+
buildDirectory: /dev/shm/bk
175+
- label: third-party / ms-graph
176+
command: |
177+
.ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION msGraphThirdPartyTest
178+
env:
179+
USE_3RD_PARTY_MS_GRAPH_CREDENTIALS: "true"
180+
timeout_in_minutes: 30
181+
agents:
182+
provider: gcp
183+
image: family/elasticsearch-ubuntu-2404
184+
machineType: n2-standard-8
185+
buildDirectory: /dev/shm/bk
186+
- group: lucene-compat
187+
steps:
188+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
189+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
190+
timeout_in_minutes: 300
191+
matrix:
192+
setup:
193+
LUCENE_VERSION:
194+
- "10.0.0"
195+
ES_VERSION:
196+
- "9.0.0"
197+
ES_COMMIT:
198+
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
199+
agents:
200+
provider: gcp
201+
image: family/elasticsearch-ubuntu-2404
202+
machineType: custom-32-98304
203+
buildDirectory: /dev/shm/bk
204+
env:
205+
ES_VERSION: "{{matrix.ES_VERSION}}"
206+
ES_COMMIT: "{{matrix.ES_COMMIT}}"

0 commit comments

Comments
 (0)