From d747cf6d13ab67983e1a287eb504386da7e80fdc Mon Sep 17 00:00:00 2001 From: imonteroperez Date: Fri, 6 Sep 2024 16:03:58 +0200 Subject: [PATCH 1/2] Bump bom to fix junit issues --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 186ccfa..8088680 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 999999-SNAPSHOT - 2.387.3 + 2.462.2 jenkinsci/${project.artifactId}-plugin @@ -45,8 +45,8 @@ io.jenkins.tools.bom - bom-2.387.x - 2543.vfb_1a_5fb_9496d + bom-2.462.x + 3334.v18e2a_2f48356 import pom From ab594bcc91b03199c353a2cb87c72d293ad5fe2a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 6 Sep 2024 11:49:58 -0400 Subject: [PATCH 2/2] Working around https://github.com/jenkinsci/junit-plugin/pull/625#discussion_r1747346165 --- .../parallel_test_executor/ParallelTestExecutorTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/java/org/jenkinsci/plugins/parallel_test_executor/ParallelTestExecutorTest.java b/src/test/java/org/jenkinsci/plugins/parallel_test_executor/ParallelTestExecutorTest.java index 81eb088..74187ee 100644 --- a/src/test/java/org/jenkinsci/plugins/parallel_test_executor/ParallelTestExecutorTest.java +++ b/src/test/java/org/jenkinsci/plugins/parallel_test_executor/ParallelTestExecutorTest.java @@ -6,6 +6,7 @@ import hudson.model.ParametersDefinitionProperty; import hudson.model.StringParameterDefinition; import hudson.model.StringParameterValue; +import hudson.tasks.junit.TestResultAction; import java.io.File; import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; @@ -103,6 +104,11 @@ public void workflowDoesNotGenerateInclusionsFromRunningBuild() throws Exception jenkinsRule.waitForCompletion(b1); } + static { + // https://github.com/jenkinsci/junit-plugin/pull/625#discussion_r1747346165 + System.setProperty(TestResultAction.class.getName() + ".RESULT_CACHE_ENABLED", "false"); + } + @Issue("JENKINS-71139") @Test public void unloadableTestResult() throws Exception {