Skip to content
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

Jump to bottom

JENKINS-30077 - Expand build parameters #31

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

JENKINS-30077 - Expand build parameters #31

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
12 changes: 12 additions & 0 deletions src/main/java/hudson/plugins/ws_cleanup/RemoteCleaner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import hudson.model.Run;
import hudson.model.TaskListener;
import hudson.slaves.EnvironmentVariablesNodeProperty;
import hudson.EnvVars;

import java.io.IOException;
import java.util.List;
Expand All @@ -47,6 +48,17 @@
TaskListener listener,
Run<?, ?> build
) {
try {
EnvVars vars = build.getEnvironment(listener);

for (int i = 0; i < patterns.size(); i++) {
Copy link
Member

Choose a reason for hiding this comment

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

patterns can be null here.

Copy link
Author

Choose a reason for hiding this comment

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

Doh! Good point.

patterns.set(i, new Pattern(vars.expand(patterns.get(i).getPattern()), patterns.get(i).getType()));
Copy link
Member

@olivergondza olivergondza Sep 15, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

NIT: Using VariableResolver will save some object instantiations here.

Copy link
Author

Choose a reason for hiding this comment

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

Thx, will take a look.

}
externalDelete = vars.expand(externalDelete);
} catch (Exception e) {
Copy link
Member

Choose a reason for hiding this comment

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

What failures do we expect here?

Copy link
Author

Choose a reason for hiding this comment

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

That was to satisfy an error that was thrown when using EnvVars vars = build.getEnvironment(listener); that complained there wasn't an exception catch.

e.printStackTrace(listener.getLogger());
}

boolean wipeout = (patterns == null || patterns.isEmpty())
&& (externalDelete == null || externalDelete.isEmpty())
;
Expand Down