Skip to content

Commit 64fcc6b

Browse files
davidkyledavidkyle
authored
Merge branch 'main' into fix-128952
2 parents f7683e1 + 5168cbf commit 64fcc6b

File tree

936 files changed

+31288
-8809
lines changed

Some content is hidden

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

936 files changed

+31288
-8809
lines changed

‎.buildkite/hooks/pre-command‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,11 @@ if [[ "${USE_PROD_DOCKER_CREDENTIALS:-}" == "true" ]]; then
9595
fi
9696

9797
if [[ "${USE_PERF_CREDENTIALS:-}" == "true" ]]; then
98-
PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/esbench-metics)
99-
PERF_METRICS_INDEX="dummy-micro-benchmarks"
100-
PERF_METRICS_USERNAME=$(vault read -field=es_username /secret/ci/elastic-elasticsearch/esbench-metics)
101-
PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/esbench-metics)
98+
PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/microbenchmarks-metrics)
99+
PERF_METRICS_USERNAME=$(vault read -field=es_user /secret/ci/elastic-elasticsearch/microbenchmarks-metrics)
100+
PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/microbenchmarks-metrics)
102101

103102
export PERF_METRICS_HOST
104-
export PERF_METRICS_INDEX
105103
export PERF_METRICS_USERNAME
106104
export PERF_METRICS_PASSWORD
107105
fi

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ steps:
4848
image: family/elasticsearch-ubuntu-2004
4949
machineType: n1-standard-32
5050
buildDirectory: /dev/shm/bk
51+
- label: part6
52+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6
53+
timeout_in_minutes: 300
54+
agents:
55+
provider: gcp
56+
image: family/elasticsearch-ubuntu-2004
57+
machineType: n1-standard-32
58+
buildDirectory: /dev/shm/bk
59+
5160
- group: bwc-snapshots
5261
steps:
5362
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"

‎.buildkite/pipelines/intake.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ steps:
4949
image: family/elasticsearch-ubuntu-2004
5050
machineType: n1-standard-32
5151
buildDirectory: /dev/shm/bk
52+
- label: part6
53+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6
54+
timeout_in_minutes: 300
55+
agents:
56+
provider: gcp
57+
image: family/elasticsearch-ubuntu-2004
58+
machineType: n1-standard-32
59+
buildDirectory: /dev/shm/bk
5260
- group: bwc-snapshots
5361
steps:
5462
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ steps:
4848
image: family/elasticsearch-ubuntu-2004
4949
machineType: custom-32-98304
5050
buildDirectory: /dev/shm/bk
51+
- label: part6
52+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6
53+
timeout_in_minutes: 300
54+
agents:
55+
provider: gcp
56+
image: family/elasticsearch-ubuntu-2004
57+
machineType: custom-32-98304
58+
buildDirectory: /dev/shm/bk
5159
- group: bwc-snapshots
5260
steps:
5361
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ steps:
4545
- checkPart3
4646
- checkPart4
4747
- checkPart5
48+
- checkPart6
4849
- checkRestCompat
4950
agents:
5051
provider: gcp
@@ -71,6 +72,7 @@ steps:
7172
- checkPart3
7273
- checkPart4
7374
- checkPart5
75+
- checkPart6
7476
- checkRestCompat
7577
agents:
7678
provider: aws

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ steps:
5151
- checkPart3
5252
- checkPart4
5353
- checkPart5
54+
- checkPart6
5455
- checkRestCompat
5556
agents:
5657
provider: gcp
@@ -93,6 +94,7 @@ steps:
9394
- checkPart3
9495
- checkPart4
9596
- checkPart5
97+
- checkPart6
9698
- checkRestCompat
9799
agents:
98100
provider: gcp

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ steps:
470470
- checkPart3
471471
- checkPart4
472472
- checkPart5
473+
- checkPart6
473474
- checkRestCompat
474475
agents:
475476
provider: gcp
@@ -512,6 +513,7 @@ steps:
512513
- checkPart3
513514
- checkPart4
514515
- checkPart5
516+
- checkPart6
515517
- checkRestCompat
516518
agents:
517519
provider: gcp

‎.buildkite/pipelines/pull-request/bwc-snapshots.yml‎

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ config:
66
steps:
77
- group: bwc-snapshots
88
steps:
9-
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
10-
key: "bwc-snapshots"
11-
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTest
9+
- label: "{{matrix.BWC_VERSION}} / Part 1 / bwc-snapshots"
10+
key: "bwc-snapshots-part1"
11+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart1
1212
timeout_in_minutes: 300
1313
matrix:
1414
setup:
@@ -18,3 +18,64 @@ steps:
1818
image: family/elasticsearch-ubuntu-2004
1919
machineType: n1-standard-32
2020
buildDirectory: /dev/shm/bk
21+
- label: "{{matrix.BWC_VERSION}} / Part 2 / bwc-snapshots"
22+
key: "bwc-snapshots-part2"
23+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart2
24+
timeout_in_minutes: 300
25+
matrix:
26+
setup:
27+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
28+
agents:
29+
provider: gcp
30+
image: family/elasticsearch-ubuntu-2004
31+
machineType: n1-standard-32
32+
buildDirectory: /dev/shm/bk
33+
- label: "{{matrix.BWC_VERSION}} / Part 3 / bwc-snapshots"
34+
key: "bwc-snapshots-part3"
35+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart3
36+
timeout_in_minutes: 300
37+
matrix:
38+
setup:
39+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
40+
agents:
41+
provider: gcp
42+
image: family/elasticsearch-ubuntu-2004
43+
machineType: n1-standard-32
44+
buildDirectory: /dev/shm/bk
45+
- label: "{{matrix.BWC_VERSION}} / Part 4 / bwc-snapshots"
46+
key: "bwc-snapshots-part4"
47+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart5
48+
timeout_in_minutes: 300
49+
matrix:
50+
setup:
51+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
52+
agents:
53+
provider: gcp
54+
image: family/elasticsearch-ubuntu-2004
55+
machineType: n1-standard-32
56+
buildDirectory: /dev/shm/bk
57+
- label: "{{matrix.BWC_VERSION}} / Part 5 / bwc-snapshots"
58+
key: "bwc-snapshots-part5"
59+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart5
60+
timeout_in_minutes: 300
61+
matrix:
62+
setup:
63+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
64+
agents:
65+
provider: gcp
66+
image: family/elasticsearch-ubuntu-2004
67+
machineType: n1-standard-32
68+
buildDirectory: /dev/shm/bk
69+
- label: "{{matrix.BWC_VERSION}} / Part 6 / bwc-snapshots"
70+
key: "bwc-snapshots-part6"
71+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart6
72+
timeout_in_minutes: 300
73+
matrix:
74+
setup:
75+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
76+
agents:
77+
provider: gcp
78+
image: family/elasticsearch-ubuntu-2004
79+
machineType: n1-standard-32
80+
buildDirectory: /dev/shm/bk
81+

‎.buildkite/pipelines/pull-request/part-6-arm.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
config:
2+
allow-labels: "test-arm"
3+
steps:
4+
- label: part-6-arm
5+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart6
6+
timeout_in_minutes: 300
7+
agents:
8+
provider: aws
9+
imagePrefix: elasticsearch-ubuntu-2004-aarch64
10+
instanceType: m6g.8xlarge
11+
diskSizeGb: 350
12+
diskType: gp3
13+
diskName: /dev/sda1

‎.buildkite/pipelines/pull-request/part-6-fips.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
config:
2+
allow-labels:
3+
- Team:Security
4+
- test-fips
5+
steps:
6+
- label: part-6-fips
7+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true checkPart6
8+
timeout_in_minutes: 300
9+
agents:
10+
provider: gcp
11+
image: family/elasticsearch-ubuntu-2004
12+
machineType: custom-32-98304
13+
buildDirectory: /dev/shm/bk

0 commit comments

Comments
 (0)