fix failing unit test

jenkinsci · Nov 25, 2024 · dec5985 · dec5985
1 parent e4e1873
commit dec5985
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/...e-maven/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepOnMasterTest.java b/...e-maven/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepOnMasterTest.java
@@ -172,7 +172,7 @@ public void maven_build_no_traceability() throws Exception {
             "}";
         // @formatter:on
 
-        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master");
+        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master-no-traceability");
         pipeline.setDefinition(new CpsFlowDefinition(pipelineScript, true));
         WorkflowRun build = jenkinsRule.assertBuildStatus(Result.SUCCESS, pipeline.scheduleBuild2(0));
 
@@ -251,7 +251,7 @@ public void maven_build_global_traceability() throws Exception {
             "}";
         // @formatter:on
 
-        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master");
+        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master-global-traceability");
         pipeline.setDefinition(new CpsFlowDefinition(pipelineScript, true));
         WorkflowRun build = jenkinsRule.assertBuildStatus(Result.SUCCESS, pipeline.scheduleBuild2(0));
 
@@ -282,7 +282,8 @@ public void maven_build_global_traceability_disabled_for_one_step() throws Excep
             "}";
         // @formatter:on
 
-        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master");
+        WorkflowJob pipeline = jenkinsRule.createProject(
+                WorkflowJob.class, "build-on-master-global-traceability-disabled-for-one-step");
         pipeline.setDefinition(new CpsFlowDefinition(pipelineScript, true));
         WorkflowRun build = jenkinsRule.assertBuildStatus(Result.SUCCESS, pipeline.scheduleBuild2(0));
 
@@ -309,7 +310,7 @@ public void maven_build_jar_project_on_master_succeeds() throws Exception {
             "}";
         // @formatter:on
 
-        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master");
+        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master-jar-project");
         pipeline.setDefinition(new CpsFlowDefinition(pipelineScript, true));
         WorkflowRun build = jenkinsRule.assertBuildStatus(Result.SUCCESS, pipeline.scheduleBuild2(0));
 
@@ -594,7 +595,7 @@ public void maven_build_maven_hpi_project_on_master_succeeds() throws Exception
         // @formatter:off
         String pipelineScript = "node() {\n" +
             "    git($/" + gitRepoRule.toString() + "/$)\n" +
-            "    withMaven(traceability: true) {\n" +
+            "    withMaven(traceability: true, mavenLocalRepo: \"${pwd tmp: true}/m2repo\") {\n" +
             "        if (isUnix()) {\n" +
             "            sh 'mvn -P!might-produce-incrementals package'\n" +
             "        } else {\n" +
@@ -604,7 +605,7 @@ public void maven_build_maven_hpi_project_on_master_succeeds() throws Exception
             "}";
         // @formatter:on
 
-        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master");
+        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-maven-hpi-project");
         pipeline.setDefinition(new CpsFlowDefinition(pipelineScript, true));
         WorkflowRun build = jenkinsRule.assertBuildStatus(Result.SUCCESS, pipeline.scheduleBuild2(0));
 
@@ -1269,7 +1270,8 @@ public void maven_build_test_results_by_stage_and_branch() throws Exception {
             "}";
         // @formatter:on
 
-        WorkflowJob pipeline = jenkinsRule.createProject(WorkflowJob.class, "build-on-master");
+        WorkflowJob pipeline =
+                jenkinsRule.createProject(WorkflowJob.class, "build-on-master-test-results-by-stage-and-branch");
         pipeline.setDefinition(new CpsFlowDefinition(pipelineScript, true));
         WorkflowRun build = jenkinsRule.buildAndAssertSuccess(pipeline);
 

diff --git a/...s/org/jenkinsci/plugins/pipeline/maven/test/test_maven_projects/maven_hpi_project/pom.xml b/...s/org/jenkinsci/plugins/pipeline/maven/test/test_maven_projects/maven_hpi_project/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.74</version>
+    <version>5.3</version>
     <relativePath />
   </parent>
 
@@ -13,7 +13,7 @@
   <packaging>hpi</packaging>
   <properties>
     <!-- make it match with the version used by the pipeline-maven-plugin to faster the downloads -->
-    <jenkins.version>2.387.3</jenkins.version>
+    <jenkins.version>2.486</jenkins.version>
   </properties>
 
   <dependencies>