Skip to content

[JENKINS-72436] sh step on z/OS with encoding set to UTF-8 hangs when trying to read jenkins-result.txt #199

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

Merged
jglick merged 5 commits into from
Jan 5, 2024
Merged

[JENKINS-72436] sh step on z/OS with encoding set to UTF-8 hangs when trying to read jenkins-result.txt #199

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0835e40
[JENKINS-72436] on z/OS read jenkins-result.txt with encoding given in
lne3 Dec 20, 2023
78907bf
retrigger checks
lne3 Jan 3, 2024
6daee4a
Merge branch 'master' into JENKINS-72436
jglick Jan 4, 2024
7ffdb69
Apply suggestions from code review
lne3 Jan 5, 2024
0d243db
Update src/main/java/org/jenkinsci/plugins/durabletask/BourneShellScr…
lne3 Jan 5, 2024
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
13 changes: 9 additions & 4 deletions src/main/java/org/jenkinsci/plugins/durabletask/BourneShellScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,18 @@ public String getScript() {

OsType os = agentInfo.getOs();
String scriptEncodingCharset = "UTF-8";
String jenkinsResultTxtEncoding = null;
if(os == OsType.ZOS) {
Charset zOSSystemEncodingCharset = Charset.forName(ws.act(new getIBMzOsEncoding()));
if(SYSTEM_DEFAULT_CHARSET.equals(getCharset())) {
// Setting default charset to IBM z/OS default EBCDIC charset on z/OS if no encoding specified on sh step
charset(zOSSystemEncodingCharset);
}
scriptEncodingCharset = zOSSystemEncodingCharset.name();
jenkinsResultTxtEncoding = zOSSystemEncodingCharset.name();
}

ShellController c = new ShellController(ws,(os == OsType.ZOS), cookieValue);
ShellController c = new ShellController(ws,(os == OsType.ZOS), cookieValue, jenkinsResultTxtEncoding);
FilePath shf = c.getScriptFile(ws);

shf.write(script, scriptEncodingCharset);
Expand Down Expand Up @@ -275,10 +277,13 @@ private List<String> scriptLauncherCmd(ShellController c, FilePath ws, @CheckFor

/** Caching zOS flag to avoid round trip calls in exitStatus() */
private final boolean isZos;
/** Encoding of jenkins-result.txt if on z/OS, null otherwise */
private String jenkinsResultTxtEncoding;

private ShellController(FilePath ws, boolean zOsFlag, @NonNull String cookieValue) throws IOException, InterruptedException {
private ShellController(FilePath ws, boolean zOsFlag, @NonNull String cookieValue, String jenkinsResultTxtEncoding) throws IOException, InterruptedException {
super(ws, cookieValue);
this.isZos = zOsFlag;
this.jenkinsResultTxtEncoding = jenkinsResultTxtEncoding;
}

public FilePath getScriptFile(FilePath ws) throws IOException, InterruptedException {
Expand All @@ -295,7 +300,7 @@ private FilePath pidFile(FilePath ws) throws IOException, InterruptedException {
if(isZos) {
// We need to transcode status file from EBCDIC only on z/OS platform
FilePath statusFile = getResultFile(workspace);
status = statusFile.act(new StatusCheckWithEncoding(getCharset()));
status = statusFile.act(new StatusCheckWithEncoding(jenkinsResultTxtEncoding != null ? jenkinsResultTxtEncoding : getCharset()));
}
else {
status = super.exitStatus(workspace, listener);
Expand Down Expand Up @@ -385,7 +390,7 @@ public Integer invoke(File f, VirtualChannel channel) throws IOException, Interr
}
}
} catch (NumberFormatException x) {
throw new IOException("corrupted content in " + f + ": " + x, x);
throw new IOException("corrupted content in " + f + " using " + charset + ": " + x, x);
}
}
return null;
Expand Down