Skip to content

create BuildSelector if the constructor serves null for BuildSelector… #65

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
cccaternberg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

create BuildSelector if the constructor serves null for BuildSelector… #65

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
28 changes: 23 additions & 5 deletions src/main/java/hudson/plugins/s3/S3CopyArtifact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@
import hudson.model.TaskListener;
import hudson.model.listeners.ItemListener;
import hudson.model.listeners.RunListener;
import hudson.plugins.copyartifact.BuildFilter;
import hudson.plugins.copyartifact.BuildSelector;
import hudson.plugins.copyartifact.Messages;
import hudson.plugins.copyartifact.ParametersBuildFilter;
import hudson.plugins.copyartifact.WorkspaceSelector;
import hudson.plugins.copyartifact.*;
import hudson.security.AccessControlled;
import hudson.security.SecurityRealm;
import hudson.tasks.BuildStepDescriptor;
Expand Down Expand Up @@ -166,6 +162,9 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
console.println(Messages.CopyArtifact_MissingProject(expandedProject));
return false;
}
if(null==this.selector){
this.selector=createBuildSelector(env.get("BUILD_NUMBER"));
}
Run src = selector.getBuild(job.job, env, job.filter, build);
if (src == null) {
console.println(Messages.CopyArtifact_MissingBuild(expandedProject));
Expand Down Expand Up @@ -213,6 +212,25 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
}
}

private BuildSelector createBuildSelector(String buildNumber){
BuildSelector selector;
Logger log= Logger.getLogger(S3CopyArtifact.class.getName());
if (buildNumber==null || buildNumber.startsWith("$")) {
log.log(Level.WARNING, "unresolved variable {0}", buildNumber);
return null;
}
if(buildNumber.matches("[0-9]*")) {
selector=new SpecificBuildSelector(buildNumber);
}else if(buildNumber.equals("lastSuccessfulBuild")){
selector=new StatusBuildSelector(true);
}else {
throw new RuntimeException(("BuildSelector could not created for BUILD_NUMBER:" + buildNumber + " Not implemented yet!"));
}
log.log(Level.ALL,"Create BuildSelectorr "+ selector.getClass().getName() + "with number:"+ buildNumber);
return selector;
}


private boolean perform(Run src, AbstractBuild<?,?> dst, String expandedFilter, FilePath targetDir,
FilePath baseTargetDir, PrintStream console)
throws IOException, InterruptedException {
Expand Down