Skip to content

Commit

Permalink
Merge branch 'main' into aggs-error-codes-part-2
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Oct 11, 2023
2 parents 7981abd + 6eb4c8e commit 46a9944
Show file tree
Hide file tree
Showing 987 changed files with 15,543 additions and 7,435 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["7.17.14", "8.10.3", "8.11.0", "8.12.0"]
BWC_VERSION: ["7.17.15", "8.10.4", "8.11.0", "8.12.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
32 changes: 32 additions & 0 deletions .buildkite/pipelines/periodic-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,22 @@ steps:
env:
BWC_VERSION: 7.17.14

- label: "{{matrix.image}} / 7.17.15 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.15
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: 7.17.15

- label: "{{matrix.image}} / 8.0.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.0
timeout_in_minutes: 300
Expand Down Expand Up @@ -1648,6 +1664,22 @@ steps:
env:
BWC_VERSION: 8.10.3

- label: "{{matrix.image}} / 8.10.4 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.4
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.10.4

- label: "{{matrix.image}} / 8.11.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.11.0
timeout_in_minutes: 300
Expand Down
4 changes: 1 addition & 3 deletions .buildkite/pipelines/periodic-platform-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ steps:
- group: platform-support-unix
steps:
- label: "{{matrix.image}} / platform-support-unix"
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true check
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true platformSupportTests
timeout_in_minutes: 420
matrix:
setup:
Expand Down Expand Up @@ -46,7 +46,6 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- bwcTestSnapshots
- checkRestCompat
agents:
provider: gcp
Expand All @@ -70,7 +69,6 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- bwcTestSnapshots
- checkRestCompat
agents:
provider: aws
Expand Down
20 changes: 20 additions & 0 deletions .buildkite/pipelines/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,16 @@ steps:
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 7.17.14
- label: 7.17.15 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.15#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 7.17.15
- label: 8.0.0 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.0.0#bwcTest
timeout_in_minutes: 300
Expand Down Expand Up @@ -1012,6 +1022,16 @@ steps:
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.10.3
- label: 8.10.4 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.4#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.10.4
- label: 8.11.0 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.11.0#bwcTest
timeout_in_minutes: 300
Expand Down
9 changes: 9 additions & 0 deletions .buildkite/pipelines/pull-request/validate-changelogs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
steps:
- label: validate-changelogs
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed validateChangelogs
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
2 changes: 1 addition & 1 deletion .buildkite/pull-requests.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"set_commit_status": false,
"build_on_commit": true,
"build_on_comment": true,
"trigger_comment_regex": "buildkite\\W+elasticsearch-ci.+",
"trigger_comment_regex": "run\\W+elasticsearch-ci.+",
"labels": [
"buildkite-opt-in"
],
Expand Down
34 changes: 12 additions & 22 deletions .buildkite/scripts/periodic.trigger.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,23 @@ for BRANCH in "${BRANCHES[@]}"; do
LAST_GOOD_COMMIT=$(echo "${BUILD_JSON}" | jq -r '.commit')

cat <<EOF
- trigger: elasticsearch-periodic
label: Trigger periodic pipeline for $BRANCH
async: true
build:
branch: "$BRANCH"
commit: "$LAST_GOOD_COMMIT"
- trigger: elasticsearch-periodic-packaging
label: Trigger periodic-packaging pipeline for $BRANCH
async: true
build:
branch: "$BRANCH"
commit: "$LAST_GOOD_COMMIT"
- trigger: elasticsearch-periodic-platform-support
label: Trigger periodic-platform-support pipeline for $BRANCH
async: true
build:
branch: "$BRANCH"
commit: "$LAST_GOOD_COMMIT"
EOF

### Only platform-support enabled for right now
# cat <<EOF
# - trigger: elasticsearch-periodic
# label: Trigger periodic pipeline for $BRANCH
# async: true
# build:
# branch: "$BRANCH"
# commit: "$LAST_GOOD_COMMIT"
# - trigger: elasticsearch-periodic-packaging
# label: Trigger periodic-packaging pipeline for $BRANCH
# async: true
# build:
# branch: "$BRANCH"
# commit: "$LAST_GOOD_COMMIT"
# - trigger: elasticsearch-periodic-platform-support
# label: Trigger periodic-platform-support pipeline for $BRANCH
# async: true
# build:
# branch: "$BRANCH"
# commit: "$LAST_GOOD_COMMIT"
# EOF
done
Loading

0 comments on commit 46a9944

Please sign in to comment.