Skip to content

Commit fd9e16d

Browse files
thecoopthecoop
committed
Merge branch 'release-ccs-version' into bump-release-version-ids
2 parents 8086265 + 926fa58 commit fd9e16d

File tree

9,717 files changed

+399637
-118737
lines changed

Some content is hidden

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

9,717 files changed

+399637
-118737
lines changed

‎.backportrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"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" ],
3+
"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" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v8.14.0$" : "main",
6+
"^v8.15.0$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ set JOB_BRANCH=%BUILDKITE_BRANCH%
1818
set GRADLE_BUILD_CACHE_USERNAME=vault read -field=username secret/ci/elastic-elasticsearch/migrated/gradle-build-cache
1919
set GRADLE_BUILD_CACHE_PASSWORD=vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache
2020

21+
bash.exe -c "nohup bash .buildkite/scripts/setup-monitoring.sh </dev/null >/dev/null 2>&1 &"
22+
2123
exit /b 0

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ steps:
4040
image: family/elasticsearch-ubuntu-2004
4141
machineType: n1-standard-32
4242
buildDirectory: /dev/shm/bk
43+
- 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
45+
timeout_in_minutes: 300
46+
agents:
47+
provider: gcp
48+
image: family/elasticsearch-ubuntu-2004
49+
machineType: n1-standard-32
50+
buildDirectory: /dev/shm/bk
4351
- group: bwc-snapshots
4452
steps:
4553
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"

‎.buildkite/pipelines/intake.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,22 @@ steps:
4141
image: family/elasticsearch-ubuntu-2004
4242
machineType: n1-standard-32
4343
buildDirectory: /dev/shm/bk
44+
- 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
46+
timeout_in_minutes: 300
47+
agents:
48+
provider: gcp
49+
image: family/elasticsearch-ubuntu-2004
50+
machineType: n1-standard-32
51+
buildDirectory: /dev/shm/bk
4452
- group: bwc-snapshots
4553
steps:
4654
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
4755
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
4856
timeout_in_minutes: 300
4957
matrix:
5058
setup:
51-
BWC_VERSION: ["7.17.19", "8.12.2", "8.13.0", "8.14.0"]
59+
BWC_VERSION: ["7.17.23", "8.14.2", "8.15.0"]
5260
agents:
5361
provider: gcp
5462
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,22 @@ steps:
3232
image: family/elasticsearch-ubuntu-2004
3333
machineType: custom-32-98304
3434
buildDirectory: /dev/shm/bk
35+
- 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
37+
timeout_in_minutes: 300
38+
agents:
39+
provider: gcp
40+
image: family/elasticsearch-ubuntu-2004
41+
machineType: custom-32-98304
42+
buildDirectory: /dev/shm/bk
43+
- 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
45+
timeout_in_minutes: 300
46+
agents:
47+
provider: gcp
48+
image: family/elasticsearch-ubuntu-2004
49+
machineType: custom-32-98304
50+
buildDirectory: /dev/shm/bk
3551
- group: bwc-snapshots
3652
steps:
3753
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ steps:
2828
provider: gcp
2929
image: family/elasticsearch-{{matrix.image}}
3030
diskSizeGb: 350
31-
machineType: custom-16-32768
31+
machineType: n1-standard-8
3232
env: {}
3333
- group: packaging-tests-upgrade
3434
steps: $BWC_STEPS

0 commit comments

Comments
 (0)