diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 8cf2e74f8218..9e7619090110 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -255,6 +255,10 @@ jobs: - 1 - 2 - 3 + - 4 + - 5 + - 6 + - 7 test-indy: - false - true diff --git a/.github/workflows/reusable-muzzle.yml b/.github/workflows/reusable-muzzle.yml index 4ff518b5b139..87e3d2d205c5 100644 --- a/.github/workflows/reusable-muzzle.yml +++ b/.github/workflows/reusable-muzzle.yml @@ -20,6 +20,10 @@ jobs: - ":instrumentation:muzzle2" - ":instrumentation:muzzle3" - ":instrumentation:muzzle4" + - ":instrumentation:muzzle5" + - ":instrumentation:muzzle6" + - ":instrumentation:muzzle7" + - ":instrumentation:muzzle8" fail-fast: false steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 diff --git a/build.gradle.kts b/build.gradle.kts index f804e8956372..ce39f5239f2c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -68,11 +68,11 @@ if (gradle.startParameter.taskNames.contains("listTestsInPartition")) { group = "Help" description = "List test tasks in given partition" - // total of 4 partitions (see modulo 4 below) + // total of 8 partitions (see modulo 8 below) var testPartition = (project.findProperty("testPartition") as String?)?.toInt() if (testPartition == null) { throw GradleException("Test partition must be specified") - } else if (testPartition < 0 || testPartition >= 4) { + } else if (testPartition < 0 || testPartition >= 8) { throw GradleException("Invalid test partition") } @@ -82,7 +82,7 @@ if (gradle.startParameter.taskNames.contains("listTestsInPartition")) { // relying on predictable ordering of subprojects // (see https://docs.gradle.org/current/dsl/org.gradle.api.Project.html#N14CB4) // since we are splitting these tasks across different github action jobs - val enabled = testPartitionCounter++ % 4 == testPartition + val enabled = testPartitionCounter++ % 8 == testPartition if (enabled) { tasks.withType().configureEach { partitionTasks.add(this) diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts index 0726e850bdb8..82cb7f6e159c 100644 --- a/instrumentation/build.gradle.kts +++ b/instrumentation/build.gradle.kts @@ -4,13 +4,17 @@ plugins { val instrumentationProjectTest = tasks.named("test") -// batching up the muzzle tasks alphabetically into 4 chunks +// batching up the muzzle tasks alphabetically into 8 chunks // to split them up into separate CI jobs (but not too many CI job) val instrumentationProjectMuzzle = listOf( tasks.register("muzzle1"), tasks.register("muzzle2"), tasks.register("muzzle3"), tasks.register("muzzle4"), + tasks.register("muzzle5"), + tasks.register("muzzle6"), + tasks.register("muzzle7"), + tasks.register("muzzle8"), ) var counter = 0 @@ -33,6 +37,6 @@ subprojects { // relying on predictable ordering of subprojects // (see https://docs.gradle.org/current/dsl/org.gradle.api.Project.html#N14CB4) // since we are splitting these muzzleX tasks across different github action jobs - instrumentationProjectMuzzle[counter++ % 4].get().dependsOn(subProj.tasks.named("muzzle")) + instrumentationProjectMuzzle[counter++ % 8].get().dependsOn(subProj.tasks.named("muzzle")) } }