diff --git a/.buildkite/pipelines/intake.template.yml b/.buildkite/pipelines/intake.template.yml index 3aba186ed5abb..a2b16b8f94fff 100644 --- a/.buildkite/pipelines/intake.template.yml +++ b/.buildkite/pipelines/intake.template.yml @@ -48,6 +48,15 @@ steps: image: family/elasticsearch-ubuntu-2004 machineType: n1-standard-32 buildDirectory: /dev/shm/bk + - label: part6 + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6 + 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" diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml index 86809a644e5b5..96bdc9032657b 100644 --- a/.buildkite/pipelines/intake.yml +++ b/.buildkite/pipelines/intake.yml @@ -49,6 +49,14 @@ steps: image: family/elasticsearch-ubuntu-2004 machineType: n1-standard-32 buildDirectory: /dev/shm/bk + - label: part6 + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6 + 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" diff --git a/.buildkite/pipelines/lucene-snapshot/run-tests.yml b/.buildkite/pipelines/lucene-snapshot/run-tests.yml index ddc63419a2e2f..ef22ce9c140fb 100644 --- a/.buildkite/pipelines/lucene-snapshot/run-tests.yml +++ b/.buildkite/pipelines/lucene-snapshot/run-tests.yml @@ -48,6 +48,14 @@ steps: image: family/elasticsearch-ubuntu-2004 machineType: custom-32-98304 buildDirectory: /dev/shm/bk + - label: part6 + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6 + 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" diff --git a/.buildkite/pipelines/periodic-platform-support.yml b/.buildkite/pipelines/periodic-platform-support.yml index 84577b917a007..66c229b972f5a 100644 --- a/.buildkite/pipelines/periodic-platform-support.yml +++ b/.buildkite/pipelines/periodic-platform-support.yml @@ -45,6 +45,7 @@ steps: - checkPart3 - checkPart4 - checkPart5 + - checkPart6 - checkRestCompat agents: provider: gcp @@ -71,6 +72,7 @@ steps: - checkPart3 - checkPart4 - checkPart5 + - checkPart6 - checkRestCompat agents: provider: aws diff --git a/.buildkite/pipelines/periodic.template.yml b/.buildkite/pipelines/periodic.template.yml index be3f2fde1bab1..a09b4d78bd8a3 100644 --- a/.buildkite/pipelines/periodic.template.yml +++ b/.buildkite/pipelines/periodic.template.yml @@ -51,6 +51,7 @@ steps: - checkPart3 - checkPart4 - checkPart5 + - checkPart6 - checkRestCompat agents: provider: gcp @@ -92,6 +93,7 @@ steps: - checkPart3 - checkPart4 - checkPart5 + - checkPart6 - checkRestCompat agents: provider: gcp diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml index b4613acda34cd..f12e147a2c32b 100644 --- a/.buildkite/pipelines/periodic.yml +++ b/.buildkite/pipelines/periodic.yml @@ -432,6 +432,7 @@ steps: - checkPart3 - checkPart4 - checkPart5 + - checkPart6 - checkRestCompat agents: provider: gcp @@ -473,6 +474,7 @@ steps: - checkPart3 - checkPart4 - checkPart5 + - checkPart6 - checkRestCompat agents: provider: gcp diff --git a/.buildkite/pipelines/pull-request/bwc-snapshots.yml b/.buildkite/pipelines/pull-request/bwc-snapshots.yml index 5a9fc2d938ac0..0bfbc0d0e6467 100644 --- a/.buildkite/pipelines/pull-request/bwc-snapshots.yml +++ b/.buildkite/pipelines/pull-request/bwc-snapshots.yml @@ -6,9 +6,9 @@ config: steps: - group: bwc-snapshots steps: - - label: "{{matrix.BWC_VERSION}} / bwc-snapshots" - key: "bwc-snapshots" - command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTest + - label: "{{matrix.BWC_VERSION}} / Part 1 / bwc-snapshots" + key: "bwc-snapshots-part1" + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart1 timeout_in_minutes: 300 matrix: setup: @@ -18,3 +18,64 @@ steps: image: family/elasticsearch-ubuntu-2004 machineType: n1-standard-32 buildDirectory: /dev/shm/bk + - label: "{{matrix.BWC_VERSION}} / Part 2 / bwc-snapshots" + key: "bwc-snapshots-part2" + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart2 + timeout_in_minutes: 300 + matrix: + setup: + BWC_VERSION: $SNAPSHOT_BWC_VERSIONS + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: n1-standard-32 + buildDirectory: /dev/shm/bk + - label: "{{matrix.BWC_VERSION}} / Part 3 / bwc-snapshots" + key: "bwc-snapshots-part3" + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart3 + timeout_in_minutes: 300 + matrix: + setup: + BWC_VERSION: $SNAPSHOT_BWC_VERSIONS + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: n1-standard-32 + buildDirectory: /dev/shm/bk + - label: "{{matrix.BWC_VERSION}} / Part 4 / bwc-snapshots" + key: "bwc-snapshots-part4" + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart5 + timeout_in_minutes: 300 + matrix: + setup: + BWC_VERSION: $SNAPSHOT_BWC_VERSIONS + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: n1-standard-32 + buildDirectory: /dev/shm/bk + - label: "{{matrix.BWC_VERSION}} / Part 5 / bwc-snapshots" + key: "bwc-snapshots-part5" + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart5 + timeout_in_minutes: 300 + matrix: + setup: + BWC_VERSION: $SNAPSHOT_BWC_VERSIONS + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: n1-standard-32 + buildDirectory: /dev/shm/bk + - label: "{{matrix.BWC_VERSION}} / Part 6 / bwc-snapshots" + key: "bwc-snapshots-part6" + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart6 + timeout_in_minutes: 300 + matrix: + setup: + BWC_VERSION: $SNAPSHOT_BWC_VERSIONS + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: n1-standard-32 + buildDirectory: /dev/shm/bk + diff --git a/.buildkite/pipelines/pull-request/part-6-arm.yml b/.buildkite/pipelines/pull-request/part-6-arm.yml new file mode 100644 index 0000000000000..d4300ed4303bb --- /dev/null +++ b/.buildkite/pipelines/pull-request/part-6-arm.yml @@ -0,0 +1,13 @@ +config: + allow-labels: "test-arm" +steps: + - label: part-6-arm + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart6 + timeout_in_minutes: 300 + agents: + provider: aws + imagePrefix: elasticsearch-ubuntu-2004-aarch64 + instanceType: m6g.8xlarge + diskSizeGb: 350 + diskType: gp3 + diskName: /dev/sda1 diff --git a/.buildkite/pipelines/pull-request/part-6-fips.yml b/.buildkite/pipelines/pull-request/part-6-fips.yml new file mode 100644 index 0000000000000..317e7e90756e4 --- /dev/null +++ b/.buildkite/pipelines/pull-request/part-6-fips.yml @@ -0,0 +1,13 @@ +config: + allow-labels: + - Team:Security + - test-fips +steps: + - label: part-6-fips + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true checkPart6 + timeout_in_minutes: 300 + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: custom-32-98304 + buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/part-6-windows.yml b/.buildkite/pipelines/pull-request/part-6-windows.yml new file mode 100644 index 0000000000000..bc32e0181ff42 --- /dev/null +++ b/.buildkite/pipelines/pull-request/part-6-windows.yml @@ -0,0 +1,14 @@ +config: + allow-labels: "test-windows" +steps: + - label: part-6-windows + command: .\.buildkite\scripts\run-script.ps1 bash .buildkite/scripts/windows-run-gradle.sh + timeout_in_minutes: 300 + agents: + provider: gcp + image: family/elasticsearch-windows-2022 + machineType: custom-32-98304 + diskType: pd-ssd + diskSizeGb: 350 + env: + GRADLE_TASK: checkPart6 diff --git a/.buildkite/pipelines/pull-request/part-6.yml b/.buildkite/pipelines/pull-request/part-6.yml new file mode 100644 index 0000000000000..e0d201337c843 --- /dev/null +++ b/.buildkite/pipelines/pull-request/part-6.yml @@ -0,0 +1,10 @@ +steps: + - label: part-6 + command: | + .ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart6 + timeout_in_minutes: 300 + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: custom-32-98304 + buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/release-tests.yml b/.buildkite/pipelines/pull-request/release-tests.yml index 101f13e569514..b3b3c44b19569 100644 --- a/.buildkite/pipelines/pull-request/release-tests.yml +++ b/.buildkite/pipelines/pull-request/release-tests.yml @@ -15,6 +15,7 @@ steps: - checkPart3 - checkPart4 - checkPart5 + - checkPart6 agents: provider: gcp image: family/elasticsearch-ubuntu-2004 diff --git a/build.gradle b/build.gradle index 5cdd8e986f779..6d8a3e98dd3a5 100644 --- a/build.gradle +++ b/build.gradle @@ -349,6 +349,14 @@ allprojects { dependsOn 'assemble' } } + + tasks.addRule("Pattern: v#bwcTestPart4") { name -> + if(name.endsWith("#bwcTestPart4")) { + project.getTasks().register(name) { + task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part4") }) + } + } + } } else if (project.path == ":x-pack:plugin" || project.path.contains("ql") || project.path.contains("smoke-test")) { tasks.register('checkPart3') { dependsOn 'check' @@ -356,6 +364,14 @@ allprojects { dependsOn 'assemble' } } + + tasks.addRule("Pattern: v#bwcTestPart3") { name -> + if(name.endsWith("#bwcTestPart3")) { + project.getTasks().register(name) { + task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part3") }) + } + } + } } else if (project.path.contains("multi-node")) { tasks.register('checkPart5') { dependsOn 'check' @@ -363,6 +379,13 @@ allprojects { dependsOn 'assemble' } } + tasks.addRule("Pattern: v#bwcTestPart5") { name -> + if(name.endsWith("#bwcTestPart5")) { + project.getTasks().register(name) { + task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part5") }) + } + } + } } else { tasks.register('checkPart2') { dependsOn 'check' @@ -370,6 +393,27 @@ allprojects { dependsOn 'assemble' } } + tasks.addRule("Pattern: v#bwcTestPart2") { name -> + if(name.endsWith("#bwcTestPart2")) { + project.getTasks().register(name) { + task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part2") }) + } + } + } + } + } else if(project.path.startsWith(":qa:")) { + tasks.register('checkPart6') { + dependsOn 'check' + withReleaseBuild { + dependsOn 'assemble' + } + } + tasks.addRule("Pattern: v#bwcTestPart6") { name -> + if(name.endsWith("#bwcTestPart6")) { + project.getTasks().register(name) { + task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part6") }) + } + } } } else { tasks.register('checkPart1') { @@ -378,6 +422,13 @@ allprojects { dependsOn 'assemble' } } + tasks.addRule("Pattern: v#bwcTestPart1") { name -> + if(name.endsWith("#bwcTestPart1")) { + project.getTasks().register(name) { + task -> task.dependsOn(tasks.named { tskName -> tskName == (name - "Part1") }) + } + } + } } tasks.register('functionalTests') { dependsOn 'check'