mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-06-27 09:00:04 -04:00
Split up bc and pr upgrade tests (#129756)
Splits up bc and pr upgrade tests as they tend to be a bottle neck in intake and pr builds nowadays.
This commit is contained in:
Rene Groeschke
GitHub
parent
e3838a4b9c
commit
f1b2c8dd8e
3 changed files with 57 additions and 113 deletions
|
|
@ -56,20 +56,17 @@ echo "Running BC upgrade tests on $BUILDKITE_BRANCH [$BC_VERSION] using BC (or s
|
|||
|
||||
cat <<EOF | buildkite-agent pipeline upload
|
||||
steps:
|
||||
- label: bc-upgrade $BC_BUILD_ID -> $BUILDKITE_BRANCH
|
||||
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=${BC_VERSION} -Dtests.bwc.refspec.main=${BC_COMMIT_HASH} bcUpgradeTest -Dtests.jvm.argline="-Des.serverless_transport=true"
|
||||
timeout_in_minutes: 300
|
||||
agents:
|
||||
provider: gcp
|
||||
image: family/elasticsearch-ubuntu-2004
|
||||
machineType: n1-standard-32
|
||||
buildDirectory: /dev/shm/bk
|
||||
preemptible: true
|
||||
retry:
|
||||
automatic:
|
||||
- exit_status: "-1"
|
||||
limit: 3
|
||||
signal_reason: none
|
||||
- signal_reason: agent_stop
|
||||
limit: 3
|
||||
- group: "bc-upgrade $BC_BUILD_ID -> $BUILDKITE_BRANCH"
|
||||
steps:
|
||||
- label: "bc-upgrade-tests-part{{matrix.PART}}"
|
||||
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=${BC_VERSION} -Dtests.bwc.refspec.main=${BC_COMMIT_HASH} bcUpgradeTestPart{{matrix.PART}} -Dtests.jvm.argline="-Des.serverless_transport=true"
|
||||
timeout_in_minutes: 300
|
||||
agents:
|
||||
provider: gcp
|
||||
image: family/elasticsearch-ubuntu-2004
|
||||
machineType: n1-standard-32
|
||||
buildDirectory: /dev/shm/bk
|
||||
matrix:
|
||||
setup:
|
||||
PART: ["1", "2", "3", "4", "5", "6"]
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -24,22 +24,19 @@ VERSION=$(sed -n 's/^elasticsearch[[:space:]]*=[[:space:]]*\(.*\)/\1/p' build-to
|
|||
|
||||
echo "Running PR upgrade tests from $BUILDKITE_PULL_REQUEST_BASE_BRANCH [$BASE_COMMIT] to $BUILDKITE_BRANCH [$BUILDKITE_COMMIT]."
|
||||
|
||||
cat <<EOF | buildkite-agent pipeline upload
|
||||
cat << EOF | buildkite-agent pipeline upload
|
||||
steps:
|
||||
- label: pr-upgrade $BUILDKITE_PULL_REQUEST_BASE_BRANCH -> $BUILDKITE_BRANCH
|
||||
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=${VERSION}-SNAPSHOT -Dtests.bwc.refspec.main=${BASE_COMMIT} bcUpgradeTest -Dtests.jvm.argline="-Des.serverless_transport=true"
|
||||
timeout_in_minutes: 300
|
||||
agents:
|
||||
provider: gcp
|
||||
image: family/elasticsearch-ubuntu-2004
|
||||
machineType: n1-standard-32
|
||||
buildDirectory: /dev/shm/bk
|
||||
preemptible: true
|
||||
retry:
|
||||
automatic:
|
||||
- exit_status: "-1"
|
||||
limit: 3
|
||||
signal_reason: none
|
||||
- signal_reason: agent_stop
|
||||
limit: 3
|
||||
- group: "pr-upgrade $BUILDKITE_PULL_REQUEST_BASE_BRANCH -> $BUILDKITE_BRANCH"
|
||||
steps:
|
||||
- label: "pr-upgrade-part-{{matrix.PART}}"
|
||||
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=${VERSION}-SNAPSHOT -Dtests.bwc.refspec.main=${BASE_COMMIT} bcUpgradeTestPart{{matrix.PART}} -Dtests.jvm.argline="-Des.serverless_transport=true"
|
||||
timeout_in_minutes: 300
|
||||
agents:
|
||||
provider: gcp
|
||||
image: family/elasticsearch-ubuntu-2004
|
||||
machineType: n1-standard-32
|
||||
buildDirectory: /dev/shm/bk
|
||||
matrix:
|
||||
setup:
|
||||
PART: ["1", "2", "3", "4", "5", "6"]
|
||||
EOF
|
||||
|
|
|
|||
110
build.gradle
110
build.gradle
|
|
@ -351,95 +351,45 @@ allprojects {
|
|||
}
|
||||
}
|
||||
|
||||
def splitForCI = { proj, partString ->
|
||||
proj.tasks.register("check$partString") {
|
||||
dependsOn 'check'
|
||||
withReleaseBuild {
|
||||
dependsOn 'assemble'
|
||||
}
|
||||
}
|
||||
|
||||
proj.tasks.addRule("Pattern: v<BWC_VERSION>#bwcTest$partString") { name ->
|
||||
if(name.endsWith("#bwcTest$partString")) {
|
||||
proj.project.getTasks().register(name) {
|
||||
task -> task.dependsOn(proj.tasks.named { tskName -> tskName == (name - partString) })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
proj.tasks.register("bcUpgradeTest$partString") {
|
||||
dependsOn tasks.matching { it.name == 'bcUpgradeTest' }
|
||||
withReleaseBuild {
|
||||
dependsOn 'assemble'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
plugins.withId('lifecycle-base') {
|
||||
if (project.path.startsWith(":x-pack:")) {
|
||||
if (project.path.contains("security") || project.path.contains(":ml")) {
|
||||
tasks.register('checkPart4') {
|
||||
dependsOn 'check'
|
||||
withReleaseBuild {
|
||||
dependsOn 'assemble'
|
||||
}
|
||||
}
|
||||
|
||||
tasks.addRule("Pattern: v<BWC_VERSION>#bwcTestPart4") { name ->
|
||||
if(name.endsWith("#bwcTestPart4")) {
|
||||
project.getTasks().register(name) {
|
||||
task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part4") })
|
||||
}
|
||||
}
|
||||
}
|
||||
splitForCI(project, "Part4")
|
||||
} else if (project.path == ":x-pack:plugin" || project.path.contains("ql") || project.path.contains("smoke-test")) {
|
||||
tasks.register('checkPart3') {
|
||||
dependsOn 'check'
|
||||
withReleaseBuild {
|
||||
dependsOn 'assemble'
|
||||
}
|
||||
}
|
||||
|
||||
tasks.addRule("Pattern: v<BWC_VERSION>#bwcTestPart3") { name ->
|
||||
if(name.endsWith("#bwcTestPart3")) {
|
||||
project.getTasks().register(name) {
|
||||
task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part3") })
|
||||
}
|
||||
}
|
||||
}
|
||||
splitForCI(project, "Part3")
|
||||
} else if (project.path.contains("multi-node")) {
|
||||
tasks.register('checkPart5') {
|
||||
dependsOn 'check'
|
||||
withReleaseBuild {
|
||||
dependsOn 'assemble'
|
||||
}
|
||||
}
|
||||
tasks.addRule("Pattern: v<BWC_VERSION>#bwcTestPart5") { name ->
|
||||
if(name.endsWith("#bwcTestPart5")) {
|
||||
project.getTasks().register(name) {
|
||||
task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part5") })
|
||||
}
|
||||
}
|
||||
}
|
||||
splitForCI(project, "Part5")
|
||||
} else {
|
||||
tasks.register('checkPart2') {
|
||||
dependsOn 'check'
|
||||
withReleaseBuild {
|
||||
dependsOn 'assemble'
|
||||
}
|
||||
}
|
||||
tasks.addRule("Pattern: v<BWC_VERSION>#bwcTestPart2") { name ->
|
||||
if(name.endsWith("#bwcTestPart2")) {
|
||||
project.getTasks().register(name) {
|
||||
task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part2") })
|
||||
}
|
||||
}
|
||||
}
|
||||
splitForCI(project, "Part2")
|
||||
}
|
||||
} else if(project.path.startsWith(":qa:")) {
|
||||
tasks.register('checkPart6') {
|
||||
dependsOn 'check'
|
||||
withReleaseBuild {
|
||||
dependsOn 'assemble'
|
||||
}
|
||||
}
|
||||
tasks.addRule("Pattern: v<BWC_VERSION>#bwcTestPart6") { name ->
|
||||
if(name.endsWith("#bwcTestPart6")) {
|
||||
project.getTasks().register(name) {
|
||||
task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part6") })
|
||||
}
|
||||
}
|
||||
}
|
||||
splitForCI(project, "Part6")
|
||||
} else {
|
||||
tasks.register('checkPart1') {
|
||||
dependsOn 'check'
|
||||
withReleaseBuild {
|
||||
dependsOn 'assemble'
|
||||
}
|
||||
}
|
||||
tasks.addRule("Pattern: v<BWC_VERSION>#bwcTestPart1") { name ->
|
||||
if(name.endsWith("#bwcTestPart1")) {
|
||||
project.getTasks().register(name) {
|
||||
task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part1") })
|
||||
}
|
||||
}
|
||||
}
|
||||
splitForCI(project, "Part1")
|
||||
}
|
||||
tasks.register('functionalTests') {
|
||||
dependsOn 'check'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue