GitHub-Mirror/Bamboo-GitHub
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Bamboo-GitHub.git synced 2025-03-15 18:31:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not set custom build variables

Browse source 
Now that the PR info is stored in the branch plan, we no longer
need to set them per build.
This commit is contained in:
carolynvs 2015-09-20 21:58:49 -05:00
parent 1cd43ee89e
commit d4767077c0
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/carolynvs/gitallthethings/webhook/PlanTrigger.java
View file

@ -34,13 +34,11 @@ public class PlanTrigger
this.bambooLinkBuilder = bambooLinkBuilder;
}
public String execute(PlanKey planKey, User user, Map<String, String> variables)
public String execute(PlanKey planKey, User user)
{
ImmutableChain plan = (ImmutableChain)cachedPlanManager.getPlanByKey(planKey);
Map<String, String> params = new HashMap<String, String>();
ExecutionRequestResult result = planExecutionManager.startManualExecution(plan, user, params, variables);
ExecutionRequestResult result = planExecutionManager.startManualExecution(plan, user, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
return bambooLinkBuilder.getBuildUrl(result.getPlanResultKey().toString());
}

5
src/main/java/com/carolynvs/gitallthethings/webhook/PullRequestBuilder.java
View file

@ -49,12 +49,9 @@ public class PullRequestBuilder
private String triggerPlan(PlanKey planKey, PullRequestEvent pullRequestEvent)
{
PullRequestBuildContext buildContext = new PullRequestBuildContext();
Map<String, String> variables = buildContext.createPullRequestVariables(pullRequestEvent.PullRequest);
User triggerUser = pluginData.getAssociatedUser(planKey.toString(), pullRequestEvent);
return planTrigger.execute(planKey, triggerUser, variables);
return planTrigger.execute(planKey, triggerUser);
}
public PlanKey ensureBranchPlanExists(PlanKey planKey, PullRequest pullRequest)