Add possibility to set downstream projects for child projects. #106
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| package hudson.plugins.parameterizedtrigger.test; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
| import hudson.AbortException; | ||
| import hudson.FilePath; | ||
| import hudson.Launcher; | ||
| import hudson.matrix.AxisList; | ||
| import hudson.matrix.DefaultMatrixExecutionStrategyImpl; | ||
| import hudson.matrix.MatrixConfiguration; | ||
| import hudson.matrix.MatrixConfigurationSorter; | ||
| import hudson.matrix.MatrixProject; | ||
| import hudson.matrix.TextAxis; | ||
| import hudson.model.AbstractBuild; | ||
| import hudson.model.BuildListener; | ||
| import hudson.model.Cause; | ||
| import hudson.model.FreeStyleBuild; | ||
| import hudson.model.FreeStyleProject; | ||
| import hudson.model.ParameterDefinition; | ||
| import hudson.model.ParametersDefinitionProperty; | ||
| import hudson.model.StringParameterDefinition; | ||
| import hudson.plugins.parameterizedtrigger.AbstractBuildParameters; | ||
| import hudson.plugins.parameterizedtrigger.BuildTrigger; | ||
| import hudson.plugins.parameterizedtrigger.BuildTriggerConfig; | ||
| import hudson.plugins.parameterizedtrigger.CurrentBuildParameters; | ||
| import hudson.plugins.parameterizedtrigger.FileBuildParameters; | ||
| import hudson.plugins.parameterizedtrigger.ResultCondition; | ||
| import hudson.util.FormValidation; | ||
| import java.io.IOException; | ||
| import java.io.Serializable; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import static org.junit.Assert.*; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import hudson.tasks.Builder; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
|
|
||
| /** | ||
| * | ||
| * @author Lucie Votypkova | ||
| */ | ||
| public class BuildTriggerTest { | ||
|
|
||
| @Rule | ||
| public JenkinsRule r = new JenkinsRule(); | ||
|
|
||
| @Test | ||
| public void testParentProjectTrigger() throws Exception{ | ||
| FreeStyleProject downstream = r.createFreeStyleProject("downstream"); | ||
| MatrixProject upstream = r.createProject(MatrixProject.class, "upstream"); | ||
| List<ParameterDefinition> definition = new ArrayList<ParameterDefinition>(); | ||
| definition.add(new StringParameterDefinition("parameter","parameter-value")); | ||
| upstream.addProperty(new ParametersDefinitionProperty(definition)); | ||
| AxisList axes = new AxisList(); | ||
| axes.add(new TextAxis("textAxis","one","two")); | ||
| upstream.setAxes(axes); | ||
| List<AbstractBuildParameters> params = new ArrayList<AbstractBuildParameters>(); | ||
| params.add(new CurrentBuildParameters()); | ||
| BuildTrigger triggerBuilder = new BuildTrigger(new BuildTriggerConfig("downstream", ResultCondition.SUCCESS, false, null, params, false)); | ||
| upstream.getPublishersList().add(triggerBuilder); | ||
| r.buildAndAssertSuccess(upstream); | ||
| r.waitUntilNoActivity(); | ||
| FreeStyleBuild downstreamBuild = downstream.getLastBuild(); | ||
| assertNotNull("Downstream job should be triggered", downstreamBuild); | ||
| String project = downstreamBuild.getCause(Cause.UpstreamCause.class).getUpstreamProject(); | ||
| assertEquals("Build should be triggered by matrix project.", "upstream", project); | ||
| } | ||
|
|
||
| @Test | ||
| public void testChildProjectsTrigger() throws Exception{ | ||
| MatrixProject upstream = r.createProject(MatrixProject.class, "upstream"); | ||
| FreeStyleProject downstream = r.createFreeStyleProject("downstream"); | ||
|
|
||
| List<ParameterDefinition> definition = new ArrayList<ParameterDefinition>(); | ||
| definition.add(new StringParameterDefinition("parameter","parameter-value")); | ||
| ParametersDefinitionProperty property = new ParametersDefinitionProperty(definition); | ||
| upstream.addProperty(property); | ||
|
|
||
| AxisList axes = new AxisList(); | ||
| axes.add(new TextAxis("textAxis","a","b")); | ||
| upstream.setAxes(axes); | ||
| upstream.getBuildersList().add(new CreatePropertyFileBuilder()); | ||
| DefaultMatrixExecutionStrategyImpl strategy = new DefaultMatrixExecutionStrategyImpl(true, null, null, null); | ||
| upstream.setExecutionStrategy(strategy); | ||
|
|
||
| List<AbstractBuildParameters> params = new ArrayList<AbstractBuildParameters>(); | ||
| params.add(new CurrentBuildParameters()); | ||
| List<AbstractBuildParameters> parameters = new ArrayList<AbstractBuildParameters>(); | ||
| parameters.add(new FileBuildParameters("property.prop", null, false, true, null, false)); | ||
| BuildTriggerConfig config = new BuildTriggerConfig("downstream", ResultCondition.SUCCESS, false, parameters, true); | ||
| BuildTrigger triggerBuilder = new BuildTrigger(config); | ||
| upstream.getPublishersList().add(triggerBuilder); | ||
| r.jenkins.rebuildDependencyGraph(); | ||
| strategy.setSorter(new MatrixConfigurationSorterTestImpl()); | ||
|
|
||
| r.buildAndAssertSuccess(upstream); | ||
| r.waitUntilNoActivity(); | ||
|
|
||
| FreeStyleBuild downstreamBuild2 = downstream.getLastBuild(); | ||
| FreeStyleBuild downstreamBuild1 = downstreamBuild2.getPreviousBuild(); | ||
| assertNotNull("Downstream job should be triggered by matrix configuration", downstreamBuild1); | ||
| assertNotNull("Downstream job should be triggered by matrix configuration", downstreamBuild2); | ||
|
|
||
| String project1 = downstreamBuild1.getCause(Cause.UpstreamCause.class).getUpstreamProject(); | ||
| String project2 = downstreamBuild2.getCause(Cause.UpstreamCause.class).getUpstreamProject(); | ||
| ArrayList<MatrixConfiguration> configurations = Lists.newArrayList(upstream.getItems()); | ||
| Collections.sort(configurations, new MatrixConfigurationSorterTestImpl()); | ||
| assertEquals("Build should be triggered by matrix project.", configurations.get(0).getFullName(), project1); | ||
| assertEquals("Build should be triggered by matrix project.", configurations.get(1).getFullName(), project2); | ||
| } | ||
|
|
||
| public static class MatrixConfigurationSorterTestImpl extends MatrixConfigurationSorter implements Serializable { | ||
|
|
||
| @Override | ||
| public void validate(MatrixProject mp) throws FormValidation { | ||
| //do nothing | ||
| } | ||
|
|
||
| @Override | ||
| public int compare(MatrixConfiguration o1, MatrixConfiguration o2) { | ||
| return o1.getName().compareTo(o2.getName()); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public static class CreatePropertyFileBuilder extends Builder { | ||
|
|
||
| @Override | ||
| public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { | ||
| listener.getLogger().println("Creating a file property.prop"); | ||
|
|
||
| FilePath workspace = build.getWorkspace(); | ||
| if (workspace == null) { | ||
| throw new AbortException("Cannot get the workspace of the build"); | ||
| } | ||
| workspace.child("property.prop").write("value=" + build.getProject().getName(), "UTF-8"); | ||
|
|
||
| return true; | ||
| } | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would vote against using AbstractProject in the new code, but it requires rework of
ParameterizedDependencyThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for all response, I put it into my code. I am afraid that only reworking ParametrizedDependency does not help.... https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/DependencyGraph.java#L394