Skip to content

Support non-triggered parameterized builds. #115

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

Open
ccobbster wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support non-triggered parameterized builds. #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 121 additions & 0 deletions src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/ExternalLaunchSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
package stashpullrequestbuilder.stashpullrequestbuilder;

import java.util.HashMap;
import java.util.Map;

import hudson.model.ParameterValue;
import hudson.model.ParametersAction;
import hudson.model.Run;
import stashpullrequestbuilder.stashpullrequestbuilder.stash.StashPullRequestResponseValue;
import stashpullrequestbuilder.stashpullrequestbuilder.stash.StashPullRequestResponseValueRepository;

public class ExternalLaunchSupport {
private static final String PULL_REQUEST_ID = "pullRequestId";
private static final String PULL_REQUEST_VERSION = "pullRequestVersion";
private static final String PULL_REQUEST_TITLE = "pullRequestTitle";
private static final String TARGET_BRANCH = "targetBranch";
private static final String DESTINATION_COMMIT_HASH = "destinationCommitHash";
private static final String DESTINATION_REPOSITORY_NAME = "destinationRepositoryName";
private static final String DESTINATION_REPOSITORY_OWNER = "destinationRepositoryOwner";
private static final String SOURCE_BRANCH = "sourceBranch";
private static final String SOURCE_COMMIT_HASH = "sourceCommitHash";
private static final String SOURCE_REPOSITORY_NAME = "sourceRepositoryName";
private static final String SOURCE_REPOSITORY_OWNER = "sourceRepositoryOwner";

private static Map<String, String> PULL_REQUEST_NOTIFIER_FOR_BITBUCKET_MAP = new HashMap<String, String>() {
{
put(PULL_REQUEST_ID, "PULL_REQUEST_ID");
put(PULL_REQUEST_TITLE, "PULL_REQUEST_TITLE");
put(PULL_REQUEST_VERSION, "PULL_REQUEST_VERSION");
put(SOURCE_BRANCH, "PULL_REQUEST_FROM_BRANCH");
put(SOURCE_REPOSITORY_OWNER, "PULL_REQUEST_FROM_REPO_PROJECT_KEY");
put(SOURCE_REPOSITORY_NAME, "PULL_REQUEST_FROM_REPO_SLUG");
put(SOURCE_COMMIT_HASH, "PULL_REQUEST_FROM_HASH");
put(TARGET_BRANCH, "PULL_REQUEST_TO_BRANCH");
put(DESTINATION_REPOSITORY_OWNER, "PULL_REQUEST_TO_REPO_PROJECT_KEY");
put(DESTINATION_REPOSITORY_NAME, "PULL_REQUEST_TO_REPO_SLUG");
put(DESTINATION_COMMIT_HASH, "PULL_REQUEST_TO_HASH");
}
};

private static Map<String, String> STASH_PULLREQUEST_BUILDER_PLUGIN_MAP = new HashMap<String, String>() {
{
put(PULL_REQUEST_ID, PULL_REQUEST_ID);
put(PULL_REQUEST_TITLE, PULL_REQUEST_TITLE);
put(PULL_REQUEST_VERSION, PULL_REQUEST_VERSION);
put(SOURCE_BRANCH, SOURCE_BRANCH);
put(SOURCE_REPOSITORY_OWNER, SOURCE_REPOSITORY_OWNER);
put(SOURCE_REPOSITORY_NAME, SOURCE_REPOSITORY_NAME);
put(SOURCE_COMMIT_HASH, SOURCE_COMMIT_HASH);
put(TARGET_BRANCH, TARGET_BRANCH);
put(DESTINATION_REPOSITORY_OWNER, DESTINATION_REPOSITORY_OWNER);
put(DESTINATION_REPOSITORY_NAME, DESTINATION_REPOSITORY_NAME);
put(DESTINATION_COMMIT_HASH, DESTINATION_COMMIT_HASH);
}
};

private static String getStringVariableValue(ParametersAction parametersAction, Map<String, String> keymap, String key) {
ParameterValue value = parametersAction.getParameter(keymap.get(key));
return value == null || value.getValue() == null ? null : value.getValue().toString();
}

public static StashCause resolveOnStartedStashCause(final StashCause cause, final StashRepository repository,
final StashBuildTrigger trigger,
final Run<?, ?> run) {
if (cause != null)
return cause;

ParametersAction parametersAction = run.getAction(ParametersAction.class);
if (parametersAction==null)
return null;

final Map<String, String> keymap;
if (getStringVariableValue(parametersAction,
STASH_PULLREQUEST_BUILDER_PLUGIN_MAP,
DESTINATION_COMMIT_HASH) != null) {
keymap = STASH_PULLREQUEST_BUILDER_PLUGIN_MAP;
} else if (getStringVariableValue(parametersAction,
PULL_REQUEST_NOTIFIER_FOR_BITBUCKET_MAP,
DESTINATION_COMMIT_HASH) != null) {
keymap = PULL_REQUEST_NOTIFIER_FOR_BITBUCKET_MAP;
} else
return null;

StashPullRequestResponseValue pullRequest = new StashPullRequestResponseValue();
pullRequest.setToRef(new StashPullRequestResponseValueRepository());
pullRequest.getToRef()
.setLatestCommit(getStringVariableValue(parametersAction, keymap, DESTINATION_COMMIT_HASH));
pullRequest.setFromRef(new StashPullRequestResponseValueRepository());
pullRequest.getFromRef().setLatestCommit(getStringVariableValue(parametersAction, keymap, SOURCE_COMMIT_HASH));
pullRequest.setId(getStringVariableValue(parametersAction, keymap, PULL_REQUEST_ID));
repository.init();
String commentId = repository.postBuildStartCommentTo(pullRequest);

StashCause newCause = new StashCause(trigger.getStashHost(),
getStringVariableValue(parametersAction, keymap, SOURCE_BRANCH),
getStringVariableValue(parametersAction, keymap, TARGET_BRANCH),
getStringVariableValue(parametersAction, keymap, SOURCE_REPOSITORY_OWNER),
getStringVariableValue(parametersAction, keymap, SOURCE_REPOSITORY_NAME),
getStringVariableValue(parametersAction, keymap, PULL_REQUEST_ID),
getStringVariableValue(parametersAction, keymap, DESTINATION_REPOSITORY_OWNER),
getStringVariableValue(parametersAction, keymap, DESTINATION_REPOSITORY_NAME),
getStringVariableValue(parametersAction, keymap, PULL_REQUEST_TITLE),
getStringVariableValue(parametersAction, keymap, SOURCE_COMMIT_HASH),
getStringVariableValue(parametersAction, keymap, DESTINATION_COMMIT_HASH),
commentId,
getStringVariableValue(parametersAction, keymap, PULL_REQUEST_VERSION),
new HashMap<String, String>());

run.addAction(new StashCauseWrapperAction(newCause));

return newCause;
}

public static StashCause resolveOnCompletedStashCause(final StashCause cause, final Run<?, ?> run) {
if (cause != null)
return cause;
StashCauseWrapperAction causeWrapperAction = run.getAction(StashCauseWrapperAction.class);
return causeWrapperAction == null ? cause : causeWrapperAction.getStashCause();
}

}
7 changes: 5 additions & 2 deletions src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuilds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package stashpullrequestbuilder.stashpullrequestbuilder;

import hudson.EnvVars;
import hudson.model.Cause;
import hudson.model.ParameterValue;
import hudson.model.ParametersAction;
import hudson.model.Result;
import hudson.model.Run;
import hudson.model.TaskListener;
Expand Down Expand Up @@ -32,7 +35,7 @@ public StashCause getCause(Run run) {
}

public void onStarted(Run run) {
StashCause cause = this.getCause(run);
StashCause cause = ExternalLaunchSupport.resolveOnStartedStashCause(this.getCause(run), repository, trigger, run);
if (cause == null) {
return;
}
Expand All @@ -44,7 +47,7 @@ public void onStarted(Run run) {
}

public void onCompleted(Run run, TaskListener listener) {
StashCause cause = this.getCause(run);
StashCause cause = ExternalLaunchSupport.resolveOnCompletedStashCause(this.getCause(run), run);
if (cause == null) {
return;
}
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashCauseWrapperAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package stashpullrequestbuilder.stashpullrequestbuilder;

import hudson.model.InvisibleAction;

public class StashCauseWrapperAction extends InvisibleAction {
private final StashCause stashCause;

public StashCauseWrapperAction(StashCause stashCause) {
this.stashCause = stashCause;
}

public StashCause getStashCause() {
return this.stashCause;
}

}