Skip to content

Commit

Permalink
Merge branch 'main' into add-settings-component-template-for-kibana-r…
Browse files Browse the repository at this point in the history 
…eporting
  • Loading branch information
@elasticmachine
elasticmachine committed May 8, 2024
2 parents 0e656ad + ab40808 commit 27a8444
Show file tree
Hide file tree
Showing 3,037 changed files with 69,542 additions and 28,177 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .backportrc.json
View file
@@ -1,9 +1,9 @@
{
"upstream" : "elastic/elasticsearch",
"targetBranchChoices" : [ "main", "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" ],
"targetBranchChoices" : [ "main", "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" ],
"targetPRLabels" : [ "backport" ],
"branchLabelMapping" : {
"^v8.14.0$" : "main",
"^v8.15.0$" : "main",
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
}
}
2 changes: 2 additions & 0 deletions .buildkite/hooks/pre-command.bat
View file
Expand Up @@ -18,4 +18,6 @@ set JOB_BRANCH=%BUILDKITE_BRANCH%
set GRADLE_BUILD_CACHE_USERNAME=vault read -field=username secret/ci/elastic-elasticsearch/migrated/gradle-build-cache
set GRADLE_BUILD_CACHE_PASSWORD=vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache

bash.exe -c "nohup bash .buildkite/scripts/setup-monitoring.sh </dev/null >/dev/null 2>&1 &"

exit /b 0
8 changes: 8 additions & 0 deletions .buildkite/pipelines/intake.template.yml
View file
Expand Up @@ -40,6 +40,14 @@ steps:
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
- label: part5
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
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
- group: bwc-snapshots
steps:
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
Expand Down
10 changes: 9 additions & 1 deletion .buildkite/pipelines/intake.yml
View file
Expand Up @@ -41,14 +41,22 @@ steps:
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
- label: part5
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
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
- group: bwc-snapshots
steps:
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
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
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["7.17.21", "8.13.3", "8.14.0"]
BWC_VERSION: ["7.17.22", "8.13.4", "8.14.0", "8.15.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
16 changes: 16 additions & 0 deletions .buildkite/pipelines/lucene-snapshot/run-tests.yml
View file
Expand Up @@ -32,6 +32,22 @@ steps:
image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
- label: part4
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
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
- label: part5
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
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
- group: bwc-snapshots
steps:
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/periodic-packaging.template.yml
View file
Expand Up @@ -28,7 +28,7 @@ steps:
provider: gcp
image: family/elasticsearch-{{matrix.image}}
diskSizeGb: 350
machineType: custom-16-32768
machineType: n1-standard-8
env: {}
- group: packaging-tests-upgrade
steps: $BWC_STEPS
Expand Down
30 changes: 23 additions & 7 deletions .buildkite/pipelines/periodic-packaging.yml
View file
Expand Up @@ -29,7 +29,7 @@ steps:
provider: gcp
image: family/elasticsearch-{{matrix.image}}
diskSizeGb: 350
machineType: custom-16-32768
machineType: n1-standard-8
env: {}
- group: packaging-tests-upgrade
steps:
Expand Down Expand Up @@ -305,8 +305,8 @@ steps:
env:
BWC_VERSION: 7.16.3

- label: "{{matrix.image}} / 7.17.21 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.21
- label: "{{matrix.image}} / 7.17.22 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.22
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -319,7 +319,7 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 7.17.21
BWC_VERSION: 7.17.22

- label: "{{matrix.image}} / 8.0.1 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.1
Expand Down Expand Up @@ -529,8 +529,8 @@ steps:
env:
BWC_VERSION: 8.12.2

- label: "{{matrix.image}} / 8.13.3 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.3
- label: "{{matrix.image}} / 8.13.4 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.4
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -543,7 +543,7 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.13.3
BWC_VERSION: 8.13.4

- label: "{{matrix.image}} / 8.14.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.14.0
Expand All @@ -561,6 +561,22 @@ steps:
env:
BWC_VERSION: 8.14.0

- label: "{{matrix.image}} / 8.15.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.0
timeout_in_minutes: 300
matrix:
setup:
image:
- rocky-8
- ubuntu-2004
agents:
provider: gcp
image: family/elasticsearch-{{matrix.image}}
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.15.0

- group: packaging-tests-windows
steps:
- label: "{{matrix.image}} / packaging-tests-windows"
Expand Down
6 changes: 5 additions & 1 deletion .buildkite/pipelines/periodic-platform-support.yml
View file
Expand Up @@ -47,11 +47,13 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkPart5
- checkRestCompat
agents:
provider: gcp
image: family/elasticsearch-{{matrix.image}}
machineType: n1-standard-32
machineType: n1-standard-16
diskType: pd-ssd
diskSizeGb: 350
env:
Expand All @@ -70,6 +72,8 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkPart5
- checkRestCompat
agents:
provider: aws
Expand Down
10 changes: 9 additions & 1 deletion .buildkite/pipelines/periodic.bwc.template.yml
View file
Expand Up @@ -6,5 +6,13 @@
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: $BWC_VERSION
BWC_VERSION: $BWC_VERSION
retry:
automatic:
- exit_status: "-1"
limit: 3
signal_reason: none
- signal_reason: agent_stop
limit: 3
6 changes: 6 additions & 0 deletions .buildkite/pipelines/periodic.template.yml
View file
Expand Up @@ -49,6 +49,8 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkPart5
- checkRestCompat
agents:
provider: gcp
Expand Down Expand Up @@ -85,10 +87,13 @@ steps:
- graalvm-ce17
- openjdk17
- openjdk21
- openjdk22
GRADLE_TASK:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkPart5
- checkRestCompat
agents:
provider: gcp
Expand All @@ -107,6 +112,7 @@ steps:
- graalvm-ce17
- openjdk17
- openjdk21
- openjdk22
BWC_VERSION: $BWC_LIST
agents:
provider: gcp
Expand Down

0 comments on commit 27a8444

Please sign in to comment.