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

Fix PCT failures past 2.281 #419

Merged
merged 2 commits into from
Jun 3, 2021
Merged

Fix PCT failures past 2.281 #419

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
903602d
Fix PCT failures past 2.281
res0nance May 18, 2021
058a12e
Reword comment
res0nance May 18, 2021
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: 7 additions & 5 deletions ...java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
import hudson.triggers.SCMTrigger;
import hudson.triggers.TimerTrigger;
import hudson.triggers.Trigger;
import hudson.util.VersionNumber;
import jenkins.model.BuildDiscarderProperty;
import jenkins.model.Jenkins;
import jenkins.model.OptionalJobProperty;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
Expand Down Expand Up @@ -148,14 +150,14 @@ public void simpleInput() throws Exception {
"}");
}

// TODO: Remove once we move to a baseline of 2.90 or later
// TODO: Remove once we move to a baseline of 2.281 or later
private String trimParamOrEmpty() {
try {
StringParameterDefinition.class.getMethod("isTrim");
return ", trim: false";
} catch (NoSuchMethodException e) {
if (Jenkins.getVersion().isNewerThanOrEqualTo(new VersionNumber("2.281"))) {
return "";
}
else {
return ", trim: false";
}
}

@Test
Expand Down