Skip to content

[JENKINS-37341] z/OS Unix System Services enablement #80

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
dwnusbaum merged 23 commits into from
Jan 22, 2019
Merged

[JENKINS-37341] z/OS Unix System Services enablement #80

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
35a2b90
z/OS Unix System Services enablement
Aug 14, 2018
8fedff4
Stupid null pointer exception fixed
Aug 14, 2018
c413ac2
Code review fixes
Aug 24, 2018
2721dfb
z/OS will inhering encoding from sh step to transcode script.sh
Aug 24, 2018
65dc605
Test for z/OS code branch added
Aug 29, 2018
6f603f7
Merge branch 'master' of https://github.com/jenkinsci/durable-task-pl…
Sep 13, 2018
2d360e1
Merge confict resolve
Sep 13, 2018
68b5f90
Default charset will be IBM1047 on z/OS if no encoding is set in sh step
Sep 14, 2018
d9af4b1
Getting rid of constants in IBM encoding
Sep 26, 2018
492496d
Small refactoring
Sep 26, 2018
9a5fc62
Logic cleanup
Sep 26, 2018
07c9f74
Merge branch 'master' of https://github.com/jenkinsci/durable-task-pl…
Oct 10, 2018
5b8a95c
Merge branch 'master' of https://github.com/jenkinsci/durable-task-pl…
Oct 23, 2018
4419207
After review changes
Oct 23, 2018
19b6b47
Cleanup unsed imports
Oct 23, 2018
031f94f
small refactoring
Oct 23, 2018
9b5353a
Merged master
Nov 15, 2018
c0bfbca
Moved out z/OS specific code out from FileMonitoringController
Nov 15, 2018
70e3bce
After code review changes
Jan 18, 2019
b86fa3e
Findbugs redundancy check for null cleaned
Jan 18, 2019
866ac67
Another redundunt check for null removed
Jan 18, 2019
cee1ff2
Cosmetics
Jan 18, 2019
d787e74
Delete unused overload
Jan 19, 2019
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
19 changes: 11 additions & 8 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 @@ -122,13 +122,14 @@ public String getScript() {
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);
// Setting default charset to IBM z/OS default EBCDIC charset on z/OS if no encoding specified on sh step
charset(zOSSystemEncodingCharset);
}
scriptEncodingCharset = zOSSystemEncodingCharset != null ? zOSSystemEncodingCharset.name() : scriptEncodingCharset;
scriptEncodingCharset = zOSSystemEncodingCharset.name();
}

ShellController c = new ShellController(ws);
c.isZos = (os == OsType.ZOS);
FilePath shf = c.getScriptFile(ws);

shf.write(script, scriptEncodingCharset);
Expand Down Expand Up @@ -214,6 +215,9 @@ public String getScript() {
/** Last-observed modification time of {@link getLogFile} on remote computer, in milliseconds. */
private transient long checkedTimestamp;

/** Caching zOS flag to avoid round trip calls in exitStatus() */
private boolean isZos;

private ShellController(FilePath ws) throws IOException, InterruptedException {
super(ws);
}
Expand All @@ -228,9 +232,8 @@ private FilePath pidFile(FilePath ws) throws IOException, InterruptedException {
}

@Override protected Integer exitStatus(FilePath workspace, TaskListener listener) throws IOException, InterruptedException {
Integer status = null;
OsType os = workspace.act(new getOsType());
if(os == OsType.ZOS) {
Integer status;
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()));
Expand Down Expand Up @@ -323,7 +326,7 @@ static class StatusCheckWithEncoding extends MasterToSlaveFileCallable<Integer>
public Integer invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
if (f.exists() && f.length() > 0) {
try {
String fileString = Files.readFirstLine(f, Charset.forName(charset) != null ? Charset.forName(charset) : Charset.defaultCharset());
String fileString = Files.readFirstLine(f, Charset.forName(charset));
if (fileString == null || fileString.isEmpty()) {
return null;
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ protected FileMonitoringController launchWithCookie(FilePath workspace, Launcher
charset = SYSTEM_DEFAULT_CHARSET;
}

@CheckForNull public final String getCharset()
@CheckForNull final String getCharset()
{
return charset;
}
Expand Down Expand Up @@ -166,7 +166,7 @@ protected static class FileMonitoringController extends Controller { // TODO imp
/** @see FileMonitoringTask#charset */
private @CheckForNull String charset;

protected String getCharset() {
String getCharset() {
return charset;
}

Expand Down