Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fixed JENKINS-23532] Search Folders when trying to find upstream project #108

Merged
merged 3 commits into from Jun 19, 2017
Merged

[Fixed JENKINS-23532] Search Folders when trying to find upstream project #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e37f6fc
DT-522 Manually triggering build will now search other folders for th…
JamesForsee Jun 12, 2017
406b66c
DT-522 Manually triggering build will now search other folders for th…
JamesForsee Jun 12, 2017
7eab095
Merge branch 'JENKINS-38670' of https://github.com/JamesForsee/build-…
JamesForsee Jun 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
53 changes: 38 additions & 15 deletions .../java/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension.java
View file
Open in desktop
Expand Up @@ -33,16 +33,17 @@
import hudson.model.AbstractBuild;
import hudson.model.AbstractDescribableImpl;
import hudson.model.AbstractProject;
import hudson.model.Action;
import hudson.model.ParametersAction;
import hudson.model.Run;
import hudson.model.Cause;
import hudson.model.Action;
import hudson.model.CauseAction;
import hudson.model.Descriptor;
import hudson.model.Item;
import hudson.model.ItemGroup;
import hudson.model.Job;
import hudson.model.ParameterValue;
import hudson.model.ParametersAction;
import hudson.model.Run;
import hudson.plugins.parameterizedtrigger.AbstractBuildParameters;
import hudson.plugins.parameterizedtrigger.BuildTrigger;
import hudson.plugins.parameterizedtrigger.BuildTriggerConfig;
import hudson.tasks.Publisher;
import hudson.util.DescribableList;
Expand All @@ -52,13 +53,13 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.Set;
import java.util.LinkedHashMap;

/**
* @author dalvizu
Expand Down Expand Up @@ -183,12 +184,13 @@ protected CauseAction filterOutUserIdCause(CauseAction causeAction) {
public int triggerManualBuild(ItemGroup pipelineContext, Integer upstreamBuildNumber, String triggerProjectName,
String upstreamProjectName) {
final AbstractProject<?, ?> triggerProject =
(AbstractProject<?, ?>) Jenkins.getInstance().getItem(triggerProjectName, pipelineContext);
(AbstractProject<?, ?>) Jenkins.getInstance().getItem(triggerProjectName, pipelineContext);
final AbstractProject<?, ?> upstreamProject =
(AbstractProject<?, ?>) Jenkins.getInstance().getItem(upstreamProjectName, pipelineContext);
(AbstractProject<?, ?>) Jenkins.getInstance().getItem(upstreamProjectName, pipelineContext);

final AbstractBuild<?, ?> upstreamBuild = retrieveBuild(upstreamBuildNumber, upstreamProject);


// Get parameters from upstream build
if (upstreamBuild != null) {
LOGGER.fine("Getting parameters from upstream build " + upstreamBuild.getExternalizableId()); //$NON-NLS-1$
Expand All @@ -201,7 +203,6 @@ public int triggerManualBuild(ItemGroup pipelineContext, Integer upstreamBuildNu
return triggerBuild(triggerProject, upstreamBuild, buildParametersAction);
}


/**
* Schedules a build to start.
*
Expand Down Expand Up @@ -233,7 +234,8 @@ protected int triggerBuild(final AbstractProject<?, ?> triggerProject, final Abs
if (upstreamBuild != null) {


final List<AbstractBuildParameters> configs = retrieveUpstreamProjectTriggerConfig(triggerProject, upstreamBuild);
final List<AbstractBuildParameters> configs = retrieveUpstreamProjectTriggerConfig(triggerProject,
upstreamBuild);

if (configs == null) {
LOGGER.log(Level.SEVERE, "No upstream trigger found for this project: " + triggerProject.getFullDisplayName());
Expand Down Expand Up @@ -277,13 +279,28 @@ protected List<AbstractBuildParameters> retrieveUpstreamProjectTriggerConfig(fin

List<AbstractBuildParameters> configs = null;

final hudson.tasks.BuildTrigger autoTrigger =
upstreamProjectPublishersList.get(hudson.tasks.BuildTrigger.class);
if (autoTrigger != null) {
LOGGER.fine("Found Hudson Trigger (BuildTrigger) found in upstream project publisher list ");
final String downstreamProjects = autoTrigger.getChildProjectsValue();
if (downstreamProjects.contains(project.getFullName())) {
configs = new ArrayList<AbstractBuildParameters>();
} else {
LOGGER.warning("Upstream project had a Hudson BuildTrigger for projects [" + downstreamProjects
+ "], but that did not include our project [" + project.getFullName() + "]");
}
}

final BuildPipelineTrigger manualTrigger = upstreamProjectPublishersList.get(BuildPipelineTrigger.class);
if (manualTrigger != null) {
LOGGER.fine("Found Manual Trigger (BuildPipelineTrigger) found in upstream project publisher list ");
final Set<String> downstreamProjectsNames =
Sets.newHashSet(Splitter.on(",").trimResults().split(manualTrigger.getDownstreamProjectNames()));

LOGGER.fine("Downstream project names: " + downstreamProjectsNames);
// defect: requires full name in the trigger. But downstream is just fine!

if (downstreamProjectsNames.contains(project.getFullName())) {
configs = manualTrigger.getConfigs();
} else {
Expand All @@ -292,12 +309,18 @@ protected List<AbstractBuildParameters> retrieveUpstreamProjectTriggerConfig(fin
}
}

final BuildTrigger autoTrigger = upstreamProjectPublishersList.get(BuildTrigger.class);
if (autoTrigger != null) {
for (BuildTriggerConfig config : autoTrigger.getConfigs()) {
final hudson.plugins.parameterizedtrigger.BuildTrigger autoParameterizedTrigger =
upstreamProjectPublishersList.get(hudson.plugins.parameterizedtrigger.BuildTrigger.class);
if (autoParameterizedTrigger != null) {
LOGGER.fine("Found Parameterized Trigger (BuildTrigger) found in upstream project publisher list ");
for (BuildTriggerConfig config : autoParameterizedTrigger.getConfigs()) {
final Set<String> downstreamProjectsNames = Sets.newHashSet(Splitter.on(",").trimResults().split(config.getProjects()));
if (downstreamProjectsNames.contains(project.getFullName())) {
configs = config.getConfigs();
for (String currentDownstreamName : downstreamProjectsNames) {
final Job downstreamJob = (Job) Jenkins.getInstance().getItem(currentDownstreamName,
upstreamBuild.getProject().getParent(), Item.class);
if (downstreamJob != null && downstreamJob.getFullName().equals(project.getFullName())) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

configs = config.getConfigs();
}
}
}
}
Expand Down
102 changes: 92 additions & 10 deletions ...a/au/com/centrumsystems/hudson/plugin/buildpipeline/trigger/BuildPipelineTriggerTest.java
View file
Open in desktop
Expand Up @@ -31,27 +31,28 @@
import au.com.centrumsystems.hudson.plugin.buildpipeline.BuildPipelineView;
import au.com.centrumsystems.hudson.plugin.buildpipeline.DownstreamProjectGridBuilder;
import au.com.centrumsystems.hudson.plugin.buildpipeline.extension.StandardBuildCard;
import hudson.model.AbstractProject;
import hudson.model.Cause;
import hudson.model.Descriptor;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import hudson.model.Hudson;
import hudson.plugins.parameterizedtrigger.AbstractBuildParameters;
import hudson.EnvVars;
import hudson.model.*;
import hudson.plugins.parameterizedtrigger.*;

import hudson.tasks.Publisher;
import hudson.util.DescribableList;
import hudson.util.FormValidation;

import java.io.IOException;
import java.util.Collections;
import java.util.NoSuchElementException;


import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.Bug;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.*;


import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

/**
* BuildPipelineTrigger test class
Expand Down Expand Up @@ -246,6 +247,87 @@ public void testManualTriggerCause() throws Exception
assertNotNull(upstreamCause);
}

@Test
@Issue("JENKINS-23532")
public void testTriggerProjectInFolderUsingParameteriezedTrigger()
throws Exception
{
//root folder
MockFolder folder1 = jenkins.createFolder("Folder1");
MockFolder folder2 = jenkins.createFolder("Folder2");

// /Folder1
final String projUp = "upstream";
folder1.createProject(FreeStyleProject.class, projUp);
//FreeStyleProject upstreamProject = (FreeStyleProject) folder1.getItem(projUp);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove?

FreeStyleProject upstreamProject = jenkins.createFreeStyleProject(projUp);

// /Folder2
final String projDown = "downstream";
folder2.createProject(FreeStyleProject.class, projDown);
FreeStyleProject downstreamProject = (FreeStyleProject) folder2.getItem(projDown);

BuildTriggerConfig notFakeConfig = new BuildTriggerConfig("Folder2/downstream", ResultCondition.ALWAYS, false,
Collections.singletonList((AbstractBuildParameters) new CurrentBuildParameters()));
upstreamProject.getPublishersList().add(new hudson.plugins.parameterizedtrigger.BuildTrigger(notFakeConfig));
jenkins.getInstance().rebuildDependencyGraph();

BuildPipelineView view = new BuildPipelineView("Pipeline", "Title", new DownstreamProjectGridBuilder("upstream"), "1", false, "");
view.setBuildCard(new StandardBuildCard());
jenkins.buildAndAssertSuccess(upstreamProject);

view.triggerManualBuild(1, downstreamProject.getFullName(), upstreamProject.getFullName());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has upstream automatically started to build the downstream? And if so, does this mean that we are triggering a re-run and not a first-run, which had the problem we must reproduce? You can verify this by asserting null on the downstream project's latest build. If it has in fact started, a work-around would be to define the downstream project and configuration in the upstream project after the upstream has been run once.


jenkins.waitUntilNoActivity();

assertNotNull(downstreamProject.getLastBuild());
FreeStyleBuild build = downstreamProject.getLastBuild();
Cause.UserIdCause cause = build.getCause(Cause.UserIdCause.class);
assertNotNull(cause);
//Check that cause is of core class Cause.UserIdCause and not MyUserIdCause
assertEquals(Cause.UserIdCause.class.getName(), cause.getClass().getName());
Cause.UpstreamCause upstreamCause = build.getCause(Cause.UpstreamCause.class);
assertNotNull(upstreamCause);
}

@Test
public void testTriggerProjectInFolderUsingHudsonTrigger()
throws Exception
{
//root folder
MockFolder folder1 = jenkins.createFolder("Folder1");
MockFolder folder2 = jenkins.createFolder("Folder2");

// /folder1
final String projUp = "upstream";
folder1.createProject(FreeStyleProject.class, projUp);
FreeStyleProject upstreamProject = (FreeStyleProject) folder1.getItem(projUp);

// /folder2
final String projDown = "downstream";
folder2.createProject(FreeStyleProject.class, projDown);
FreeStyleProject downstreamProject = (FreeStyleProject) folder2.getItem(projDown);

upstreamProject.getPublishersList().add(new hudson.tasks.BuildTrigger(downstreamProject.getFullName(), false));
jenkins.getInstance().rebuildDependencyGraph();

BuildPipelineView view = new BuildPipelineView("Pipeline", "Title", new DownstreamProjectGridBuilder("upstream"), "1", false, "");
view.setBuildCard(new StandardBuildCard());
jenkins.buildAndAssertSuccess(upstreamProject);

view.triggerManualBuild(1, downstreamProject.getFullName(), upstreamProject.getFullName());

jenkins.waitUntilNoActivity();

assertNotNull(downstreamProject.getLastBuild());
FreeStyleBuild build = downstreamProject.getLastBuild();
Cause.UserIdCause cause = build.getCause(Cause.UserIdCause.class);
assertNotNull(cause);
assertEquals(Cause.UserIdCause.class.getName(), cause.getClass().getName());
Cause.UpstreamCause upstreamCause = build.getCause(Cause.UpstreamCause.class);
assertNotNull(upstreamCause);
}

@Test
@Issue("JENKINS-24883")
public void testReRunBuildPipelineTrigger()
Expand Down