Skip to content

Commit aba6107

Browse files
authored
Merge pull request #72 from jenkinsci/Release_7.5.0-10
Update plugin to support DAI 7.5.0-10
2 parents fc393df + 748c020 commit aba6107

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,13 @@ Output are shown in **Console Output**
164164
</tr>
165165
</thead>
166166
<tbody>
167-
<tr>
167+
<tr>
168+
<td>7.5.0-10</td>
169+
<td><a href="https://plugins.jenkins.io/eggplant-runner/">latest </a>(with bug fix. Now allows passes after re-run)</td>
170+
</tr>
171+
<tr>
168172
<td>7.5.0-9</td>
169-
<td><a href="https://plugins.jenkins.io/eggplant-runner/">latest</td>
173+
<td><a href="https://plugins.jenkins.io/eggplant-runner/"><a href="https://updates.jenkins.io/download/plugins/eggplant-runner/0.0.1.280.vfc393dfee9f1/eggplant-runner.hpi"> 0.0.1.280.vfc393dfee9f1 </a></td>
170174
</tr>
171175
<tr>
172176
<td>7.4.0-4</td>

src/main/java/io/jenkins/plugins/eggplant/utils/CLIRunnerHelper.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
public class CLIRunnerHelper{
2727

28-
private final static String CLI_VERSION = "7.5.0-9";
28+
private final static String CLI_VERSION = "7.5.0-10";
2929
private final static Map<OperatingSystem, String> CLI_FILENAME = Stream.of(
3030
new AbstractMap.SimpleEntry<>(OperatingSystem.LINUX, "eggplant-runner-Linux-${cliVersion}"),
3131
new AbstractMap.SimpleEntry<>(OperatingSystem.MACOS, "eggplant-runner-MacOS-${cliVersion}"),
@@ -88,12 +88,12 @@ public FilePath CLIValidation(String path) throws IOException
8888
String cliFilenameMinor = "";
8989
String fileName = filePath.getName();
9090

91-
if (cliFilename.length() == 29) {
92-
cliFilenameMinor = cliFilename.substring(0, cliFilename.length() - 4);
93-
filePathMinor = fileName.substring(0, fileName.length() - 4);
94-
} else if (cliFilename.length() == 35) {
95-
cliFilenameMinor = cliFilename.substring(0, cliFilename.length() - 8);
96-
filePathMinor = fileName.substring(0, fileName.length() - 8);
91+
if (cliFilename.length() == 30) {
92+
cliFilenameMinor = cliFilename.substring(0, cliFilename.length() - 5);
93+
filePathMinor = fileName.substring(0, fileName.length() - 5);
94+
} else if (cliFilename.length() == 36) {
95+
cliFilenameMinor = cliFilename.substring(0, cliFilename.length() - 9);
96+
filePathMinor = fileName.substring(0, fileName.length() - 9);
9797
} else {
9898
cliFilenameMinor = "not correct file format";
9999
filePathMinor = "not match";

0 commit comments

Comments
 (0)