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

src/main/java/org/jenkinsci/plugins/durabletask/BourneShellScript.java

@@ -34,6 +34,7 @@
 import hudson.model.TaskListener;
 import hudson.tasks.Shell;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -46,15 +47,14 @@
 import jenkins.model.Jenkins;
 import jenkins.security.MasterToSlaveCallable;
 import org.kohsuke.stapler.DataBoundConstructor;
-
 /**
  * Runs a Bourne shell script on a Unix node using {@code nohup}.
  */
 public final class BourneShellScript extends FileMonitoringTask {
 
     private static final Logger LOGGER = Logger.getLogger(BourneShellScript.class.getName());
 
-    private static enum OsType {DARWIN, UNIX, WINDOWS}
+    private static enum OsType {DARWIN, UNIX, WINDOWS, ZOS}
 
     /** Number of times we will show launch diagnostics in a newly encountered workspace before going mute to save resources. */
     @SuppressWarnings("FieldMayBeFinal")
@@ -107,7 +107,10 @@ public String getScript() {
         if (script.isEmpty()) {
             listener.getLogger().println("Warning: was asked to run an empty script");
         }
-
+        OsType os = ws.act(new getOsType());
+
+        String encoding = os == OsType.ZOS ? "IBM1047" : null;
+        if(encoding != null) charset(Charset.forName(encoding));
         ShellController c = new ShellController(ws);
 
         FilePath shf = c.getScriptFile(ws);
@@ -118,14 +121,12 @@ public String getScript() {
             String defaultShell = jenkins.getInjector().getInstance(Shell.DescriptorImpl.class).getShellOrDefault(ws.getChannel());
             s = "#!"+defaultShell+" -xe\n" + s;
         }
-        shf.write(s, "UTF-8");
+        shf.write(s, encoding==null ? "UTF-8" : encoding);
         shf.chmod(0755);
 
         scriptPath = shf.getRemote();
         List<String> args = new ArrayList<>();
 
-        OsType os = ws.act(new getOsType());
-
         if (os != OsType.DARWIN) { // JENKINS-25848
             args.add("nohup");
         }
@@ -195,9 +196,8 @@ public String getScript() {
         private transient long checkedTimestamp;
 
         private ShellController(FilePath ws) throws IOException, InterruptedException {
-            super(ws);
-        }
-
+                super(ws);
+                }
         public FilePath getScriptFile(FilePath ws) throws IOException, InterruptedException {
             return controlDir(ws).child("script.sh");
         }
@@ -264,11 +264,13 @@ private int recordExitStatus(FilePath workspace, int code) throws IOException, I
     private static final class getOsType extends MasterToSlaveCallable<OsType,RuntimeException> {
         @Override public OsType call() throws RuntimeException {
             if (Platform.isDarwin()) {
-              return OsType.DARWIN;
+                return OsType.DARWIN;
             } else if (Platform.current() == Platform.WINDOWS) {
-              return OsType.WINDOWS;
+                return OsType.WINDOWS;
+            } else if(Platform.current() == Platform.UNIX && System.getProperty("os.name").equals("z/OS")) {
+                return OsType.ZOS;  
             } else {
-              return OsType.UNIX; // Default Value
+                return OsType.UNIX; // Default Value
             }
         }
         private static final long serialVersionUID = 1L;

src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java

@@ -35,6 +35,7 @@
 import hudson.remoting.VirtualChannel;
 import hudson.slaves.WorkspaceList;
 import hudson.util.StreamTaskListener;
+import hudson.Platform;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -180,6 +181,7 @@ protected FileMonitoringController(FilePath ws) throws IOException, InterruptedE
             CountingOutputStream cos = new CountingOutputStream(transcodedSink);
             try {
                 log.act(new WriteLog(lastLocation, new RemoteOutputStream(cos)));
+                sink.flush();
                 return cos.getByteCount() > 0;
             } finally { // even if RemoteOutputStream write was interrupted, record what we actually received
                 transcodedSink.flush(); // writeImmediately flag does not seem to work
@@ -223,13 +225,15 @@ private static class TranscodingCharsetForSystemDefault extends MasterToSlaveCal
         }
 
         /** Avoids excess round-tripping when reading status file. */
-        static class StatusCheck extends MasterToSlaveFileCallable<Integer> {
+        /* replaced static class STATUS_CHECK with anonymous to capture charset */
+        final MasterToSlaveFileCallable<Integer> STATUS_CHECK_INSTANCE = new MasterToSlaveFileCallable<Integer>() {
             @Override
             @CheckForNull
             public Integer invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
                 if (f.exists() && f.length() > 0) {
                     try {
-                        String fileString = Files.readFirstLine(f, Charset.defaultCharset());
+                        Charset cs = transcodingCharset(charset);
+                        String fileString = Files.readFirstLine(f, cs == null ? Charset.defaultCharset() : cs );
                         if (fileString == null || fileString.isEmpty()) {
                             return null;
                         } else {
@@ -246,9 +250,7 @@ public Integer invoke(File f, VirtualChannel channel) throws IOException, Interr
                 }
                 return null;
             }
-        }
-
-        static final StatusCheck STATUS_CHECK_INSTANCE = new StatusCheck();
+        };
 
         @Override public Integer exitStatus(FilePath workspace, Launcher launcher, TaskListener listener) throws IOException, InterruptedException {
             FilePath status = getResultFile(workspace);