JENKINS-20756 Fixed support for folders plugin more fixes

Diabol · Nov 26, 2013 · 9e8ff9b · 9e8ff9b
1 parent 2669c2c
commit 9e8ff9b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/src/main/java/se/diabol/jenkins/pipeline/PipelineFactory.java b/src/main/java/se/diabol/jenkins/pipeline/PipelineFactory.java
@@ -73,7 +73,7 @@ private static Task getPrototypeTask(AbstractProject project) {
         String taskName = property != null && !isNullOrEmpty(property.getTaskName())
                 ? property.getTaskName() : project.getDisplayName();
         Status status = project.isDisabled() ? disabled() : idle();
-        return new Task(project.getName(), taskName, null, status, project.getUrl(), false, null);
+        return new Task(project.getRelativeNameFrom(Jenkins.getInstance()), taskName, null, status, project.getUrl(), false, null);
     }
 
     /**
@@ -116,7 +116,6 @@ public static Pipeline createPipelineAggregated(Pipeline pipeline, ItemGroup con
             }
             stages.add(new Stage(stage.getName(), tasks, version));
         }
-        //TODO add triggeredBy
         return new Pipeline(pipeline.getName(), null, null, null, null, stages, true);
     }
 
@@ -147,6 +146,7 @@ private static AbstractBuild getHighestBuild(List<Task> tasks, AbstractProject f
     public static List<Pipeline> createPipelineLatest(Pipeline pipeline, int noOfPipelines, ItemGroup context) {
         Task firstTask = pipeline.getStages().get(0).getTasks().get(0);
         AbstractProject firstProject = getProject(firstTask, context);
+        //ItemGroup i = firstProject.getParent();
 
         List<Pipeline> result = new ArrayList<Pipeline>();
 

diff --git a/src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java b/src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java
@@ -18,8 +18,7 @@
 package se.diabol.jenkins.pipeline.util;
 
 import hudson.Util;
-import hudson.model.AbstractProject;
-import hudson.model.ItemGroup;
+import hudson.model.*;
 import hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig;
 import hudson.plugins.parameterizedtrigger.SubProjectsAction;
 import hudson.util.ListBoxModel;

diff --git a/src/test/java/se/diabol/jenkins/pipeline/PipelineFactoryTest.java b/src/test/java/se/diabol/jenkins/pipeline/PipelineFactoryTest.java
@@ -643,4 +643,33 @@ public void testGetUpstreamBuildProjectRenamed() {
 
     }
 
+    @Test
+    public void getPipelineLatestWithFolders() throws Exception {
+        MockFolder folder1 = jenkins.createFolder("folder1");
+        MockFolder folder2 = jenkins.createFolder("folder2");
+        FreeStyleProject job1 = folder1.createProject(FreeStyleProject.class, "job1");
+        FreeStyleProject job2 = folder2.createProject(FreeStyleProject.class, "job2");
+
+        job1.getPublishersList().add(new BuildTrigger("folder2/job2", false));
+        jenkins.getInstance().rebuildDependencyGraph();
+
+        Pipeline prototype = PipelineFactory.extractPipeline("Folders", job1);
+
+        assertNotNull(prototype);
+
+        jenkins.buildAndAssertSuccess(job1);
+        jenkins.waitUntilNoActivity();
+
+        assertNotNull(job1.getLastBuild());
+        assertNotNull(job2.getLastBuild());
+
+        Pipeline pipeline = PipelineFactory.createPipelineLatest(prototype, folder1);
+        assertNotNull(pipeline);
+        assertEquals(2, pipeline.getStages().size());
+        assertEquals("folder1/job1", pipeline.getStages().get(0).getTasks().get(0).getId());
+        assertEquals("folder2/job2", pipeline.getStages().get(1).getTasks().get(0).getId());
+
+
+    }
+
 }