This is an automated email from the ASF dual-hosted git repository. kileysok pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push: new 9145b5b Revert PR#16253 due errors with plugin flaky-test-handler new 86f2677 Merge pull request #16930 from benWize/revert_PR_16253 9145b5b is described below commit 9145b5b191cdae5fd7e52480a9732c0cdc470343 Author: Benjamin Gonzalez <benjamin.gonza...@wizeline.com> AuthorDate: Wed Feb 23 13:14:58 2022 -0600 Revert PR#16253 due errors with plugin flaky-test-handler --- .test-infra/jenkins/job_PreCommit_Java.groovy | 7 +------ .test-infra/jenkins/job_PreCommit_Python.groovy | 9 +-------- buildSrc/build.gradle.kts | 1 - .../org/apache/beam/gradle/BeamModulePlugin.groovy | 17 ----------------- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/.test-infra/jenkins/job_PreCommit_Java.groovy b/.test-infra/jenkins/job_PreCommit_Java.groovy index aced96a..444d240 100644 --- a/.test-infra/jenkins/job_PreCommit_Java.groovy +++ b/.test-infra/jenkins/job_PreCommit_Java.groovy @@ -23,7 +23,6 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder( nameBase: 'Java', gradleTask: ':javaPreCommit', gradleSwitches: [ - '-PretryFlakyTest=true', '-PdisableSpotlessCheck=true' ], // spotless checked in separate pre-commit triggerPathPatterns: [ @@ -40,11 +39,7 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder( ) builder.build { publishers { - archiveJunit('**/build/test-results/**/*.xml') { - testDataPublishers { - publishFlakyTestsReport() - } - } + archiveJunit('**/build/test-results/**/*.xml') recordIssues { tools { errorProne() diff --git a/.test-infra/jenkins/job_PreCommit_Python.groovy b/.test-infra/jenkins/job_PreCommit_Python.groovy index 9a22495..0b5270f 100644 --- a/.test-infra/jenkins/job_PreCommit_Python.groovy +++ b/.test-infra/jenkins/job_PreCommit_Python.groovy @@ -21,9 +21,6 @@ import PrecommitJobBuilder PrecommitJobBuilder builder = new PrecommitJobBuilder( scope: this, nameBase: 'Python', - gradleSwitches: [ - '-PretryFlakyTest=true', - ], gradleTask: ':pythonPreCommit', timeoutMins: 180, triggerPathPatterns: [ @@ -35,10 +32,6 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder( builder.build { // Publish all test results to Jenkins. publishers { - archiveJunit('**/pytest*.xml'){ - testDataPublishers { - publishFlakyTestsReport() - } - } + archiveJunit('**/pytest*.xml') } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 212074e..f7992ed 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -54,7 +54,6 @@ dependencies { runtimeOnly("ca.cutterslade.gradle:gradle-dependency-analyze:1.8.3") // Enable dep analysis runtimeOnly("gradle.plugin.net.ossindex:ossindex-gradle-plugin:0.4.11") // Enable dep vulnerability analysis runtimeOnly("org.checkerframework:checkerframework-gradle-plugin:0.5.16") // Enable enhanced static checking plugin - runtimeOnly("org.gradle:test-retry-gradle-plugin:1.3.1") // Enable flaky tests mitigation } // Because buildSrc is built and tested automatically _before_ gradle diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 6c6b140..f461305 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -409,23 +409,6 @@ class BeamModulePlugin implements Plugin<Project> { project.tasks.withType(Test) { jacoco.enabled = enabled } } - // Add Retry Gradle Plugin to mitigate flaky tests - if (project.hasProperty("retryFlakyTest")) { - project.apply plugin: "org.gradle.test-retry" - project.tasks.withType(Test) { - reports{ - junitXml{ - mergeReruns = true - } - } - retry { - failOnPassedAfterRetry = false - maxFailures = 10 - maxRetries = 3 - } - } - } - // Apply a plugin which provides tasks for dependency / property / task reports. // See https://docs.gradle.org/current/userguide/project_reports_plugin.html // for further details. This is typically very useful to look at the "htmlDependencyReport"