Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from Vlatombe/JENKINS-29894
[JENKINS-29894] Allow to specify includesPatternFile
- Loading branch information
Showing
23 changed files
with
587 additions
and
27 deletions.
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
38 changes: 38 additions & 0 deletions
38
src/main/java/org/jenkinsci/plugins/parallel_test_executor/InclusionExclusionPattern.java
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,38 @@ | ||
| package org.jenkinsci.plugins.parallel_test_executor; | ||
|
|
||
| import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A list of file name patterns to include or exclude | ||
| */ | ||
| public class InclusionExclusionPattern implements Serializable { | ||
| @Whitelisted | ||
| public boolean isIncludes() { | ||
| return includes; | ||
| } | ||
|
|
||
| @Whitelisted | ||
| public List<String> getList() { | ||
| return Collections.unmodifiableList(list); | ||
| } | ||
|
|
||
| private final boolean includes; | ||
| private final List<String> list; | ||
|
|
||
| public InclusionExclusionPattern(List<String> list, boolean includes) { | ||
| this.list = list; | ||
| this.includes = includes; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "InclusionExclusionPattern{" + | ||
| "includes=" + includes + | ||
| ", list=" + list + | ||
| '}'; | ||
| } | ||
| } |
96 changes: 96 additions & 0 deletions
96
...java/org/jenkinsci/plugins/parallel_test_executor/MultipleBinaryFileParameterFactory.java
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,96 @@ | ||
| package org.jenkinsci.plugins.parallel_test_executor; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
| import hudson.Extension; | ||
| import hudson.FilePath; | ||
| import hudson.model.AbstractBuild; | ||
| import hudson.model.Action; | ||
| import hudson.model.FileParameterValue; | ||
| import hudson.model.ParametersAction; | ||
| import hudson.model.TaskListener; | ||
| import hudson.plugins.parameterizedtrigger.AbstractBuildParameterFactory; | ||
| import hudson.plugins.parameterizedtrigger.AbstractBuildParameterFactoryDescriptor; | ||
| import hudson.plugins.parameterizedtrigger.AbstractBuildParameters; | ||
| import hudson.plugins.parameterizedtrigger.FileBuildParameterFactory; | ||
| import org.kohsuke.stapler.DataBoundConstructor; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
| import java.util.List; | ||
| import java.util.logging.Logger; | ||
|
|
||
| /** | ||
| * Essentially a copy-paste of {@link hudson.plugins.parameterizedtrigger.BinaryFileParameterFactory} that takes a | ||
| * list of mappings "name -> filePattern" to generate parameters. | ||
| */ | ||
| public class MultipleBinaryFileParameterFactory extends AbstractBuildParameterFactory { | ||
| public static class ParameterBinding { | ||
| public ParameterBinding(String parameterName, String filePattern) { | ||
| this.parameterName = parameterName; | ||
| this.filePattern = filePattern; | ||
| } | ||
| public final String parameterName; | ||
| public final String filePattern; | ||
| } | ||
|
|
||
| private final List<ParameterBinding> parametersList; | ||
| private final FileBuildParameterFactory.NoFilesFoundEnum noFilesFoundAction; | ||
|
|
||
| @DataBoundConstructor | ||
| public MultipleBinaryFileParameterFactory(List<ParameterBinding> parametersList, FileBuildParameterFactory.NoFilesFoundEnum noFilesFoundAction) { | ||
| this.parametersList = parametersList; | ||
| this.noFilesFoundAction = noFilesFoundAction; | ||
| } | ||
|
|
||
| public MultipleBinaryFileParameterFactory(List<ParameterBinding> parametersList) { | ||
| this(parametersList, FileBuildParameterFactory.NoFilesFoundEnum.SKIP); | ||
| } | ||
|
|
||
| public FileBuildParameterFactory.NoFilesFoundEnum getNoFilesFoundAction() { | ||
| return noFilesFoundAction; | ||
| } | ||
|
|
||
| @Override | ||
| public List<AbstractBuildParameters> getParameters(AbstractBuild<?, ?> build, TaskListener listener) throws IOException, InterruptedException, AbstractBuildParameters.DontTriggerException { | ||
| List<AbstractBuildParameters> result = Lists.newArrayList(); | ||
| int totalFiles = 0; | ||
| for (final ParameterBinding parameterBinding : parametersList) { | ||
| // save them into the master because FileParameterValue might need files after the slave workspace have disappeared/reused | ||
| FilePath target = new FilePath(build.getRootDir()).child("parameter-files"); | ||
| int k = build.getWorkspace().copyRecursiveTo(parameterBinding.filePattern, target); | ||
| totalFiles += k; | ||
| if (k > 0) { | ||
| for (final FilePath f : target.list(parameterBinding.filePattern)) { | ||
| LOGGER.fine("Triggering build with " + f.getName()); | ||
|
|
||
| result.add(new AbstractBuildParameters() { | ||
| @Override | ||
| public Action getAction(AbstractBuild<?, ?> build, TaskListener listener) throws IOException, InterruptedException, DontTriggerException { | ||
| assert f.getChannel() == null; // we copied files locally. This file must be local to the master | ||
| FileParameterValue fv = new FileParameterValue(parameterBinding.parameterName, new File(f.getRemote()), f.getName()); | ||
| return new ParametersAction(fv); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| if (totalFiles ==0) { | ||
| noFilesFoundAction.failCheck(listener); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
|
|
||
| @Extension | ||
| public static class DescriptorImpl extends AbstractBuildParameterFactoryDescriptor { | ||
| @Override | ||
| public String getDisplayName() { | ||
| return "Multiple Binary Files (not meant to be used)"; | ||
| } | ||
| } | ||
|
|
||
| private static final Logger LOGGER = Logger.getLogger(MultipleBinaryFileParameterFactory.class.getName()); | ||
| } |
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
Oops, something went wrong.