Navigation Menu

Skip to content

Commit

Permalink
[JENKINS-14565] Cloudbees folder plugin support for manually triggere…
Browse files Browse the repository at this point in the history
…d jobs.
  • Loading branch information
ljohnston committed Sep 9, 2014
2 parents dd1440a + e667ca4 commit 132e16a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Expand Up @@ -598,7 +598,7 @@ private List<AbstractBuildParameters> retrieveUpstreamProjectTriggerConfig(final
if (manualTrigger != null) {
final Set<String> downstreamProjectsNames =
Sets.newHashSet(Splitter.on(",").trimResults().split(manualTrigger.getDownstreamProjectNames()));
if (downstreamProjectsNames.contains(project.getName())) {
if (downstreamProjectsNames.contains(project.getFullName())) {
configs = manualTrigger.getConfigs();
}
}
Expand All @@ -607,7 +607,7 @@ private List<AbstractBuildParameters> retrieveUpstreamProjectTriggerConfig(final
if (autoTrigger != null) {
for (BuildTriggerConfig config : autoTrigger.getConfigs()) {
final Set<String> downstreamProjectsNames = Sets.newHashSet(Splitter.on(",").trimResults().split(config.getProjects()));
if (downstreamProjectsNames.contains(project.getName())) {
if (downstreamProjectsNames.contains(project.getFullName())) {
configs = config.getConfigs();
}
}
Expand Down
Expand Up @@ -305,7 +305,7 @@ public FormValidation doCheckDownstreamProjectNames(@AncestorInPath AbstractProj
continue;
}
some = true;
final Item item = Jenkins.getInstance().getItem(projectName, project, Item.class);
final Item item = Jenkins.getInstance().getItemByFullName(projectName);
if (item == null) {
return FormValidation.error(Messages.BuildTrigger_NoSuchProject(projectName,
AbstractProject.findNearest(projectName, project.getParent()).getRelativeNameFrom(project)));
Expand Down

0 comments on commit 132e16a

Please sign in to comment.