Skip to content

[JENKINS-62014] Add support for build step environment filters #135

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

Closed
daniel-beck wants to merge 3 commits into from
Closed

[JENKINS-62014] Add support for build step environment filters #135

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b297a53
[JENKINS-62014] Add support for build step environment filters
daniel-beck May 11, 2020
0928b76
Use released version of Jenkins (durable-task is still SNAPSHOT)
daniel-beck Jul 23, 2020
39bc145
Depend on durable-task incremental
daniel-beck Jul 23, 2020
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.54</version>
<version>4.1</version>
<relativePath />
</parent>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -64,7 +64,7 @@
<properties>
<revision>2.36</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.176.1</jenkins.version>
<jenkins.version>2.236-SNAPSHOT</jenkins.version>
<java.level>8</java.level>
<useBeta>true</useBeta>
<workflow-step-api-plugin.version>2.20</workflow-step-api-plugin.version>
Expand All @@ -79,7 +79,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>durable-task</artifactId>
<version>1.33</version>
<version>1.35-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import hudson.init.Terminator;
import hudson.model.Node;
import hudson.model.Result;
import hudson.model.Run;
import hudson.model.TaskListener;
import hudson.remoting.Channel;
import hudson.remoting.ChannelClosedException;
Expand Down Expand Up @@ -302,6 +303,7 @@ static final class Execution extends AbstractStepExecutionImpl implements Runnab
ws = context.get(FilePath.class);
node = FilePathUtils.getNodeName(ws);
DurableTask durableTask = step.task();
durableTask.setRun(context.get(Run.class));
Copy link
Member

@dwnusbaum dwnusbaum Jul 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daniel-beck It looks like a few lines down in this method, you would have access to the launcher, so you could call launcher.prepareFilterRules(context.get(Run.class), durableTask); (not sure what context makes the most sense, could pass durableTask or this I guess...) without needing to make any changes in durable-task (other than the addition of implements EnvVarsFilterableBuilder on FileMonitoringTask, but I am not totally clear on whether it needs to be there or could be here on DurableTaskStep).

Any particular reason you wanted to make changes to each kind of task over in durable-task? I only glanced at the Jenkins core PR so may very well be missing something obvious.

if (returnStdout) {
durableTask.captureOutput();
}
Expand Down