exposed ssh exec options

johren · Mar 21, 2017 · 0d4ce63 · 0d4ce63
1 parent 03cb052
commit 0d4ce63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/jobs/ssh-job.js b/lib/jobs/ssh-job.js
@@ -37,6 +37,7 @@ function sshJobFactory(
         this.nodeId = this.context.target;
         this.commandUtil = new CommandUtil(this.nodeId);
         this.commands = this.commandUtil.buildCommands(options.commands);
+        this.sshExecOptions = options.sshExecOptions;
         assert.arrayOfObject(this.commands);
     }
     util.inherits(SshJob, BaseJob);
@@ -47,7 +48,7 @@ function sshJobFactory(
         .then(function(sshSettings) {
             return Promise.reduce(self.commands, function(results, commandData) {
                 return self.commandUtil.sshExec(
-                    commandData, sshSettings.config, new ssh.Client()
+                    commandData, sshSettings.config, new ssh.Client(), self.sshExecOptions
                 )
                 .then(function(result) {
                     return results.concat([result]);

diff --git a/lib/utils/job-utils/command-util.js b/lib/utils/job-utils/command-util.js
@@ -124,7 +124,7 @@ function commandUtilFactory(
         });
      };
 
-    CommandUtil.prototype.sshExec = function(cmdObj, sshSettings, sshClient) {
+    CommandUtil.prototype.sshExec = function(cmdObj, sshSettings, sshClient, execOptions) {
         return new Promise(function(resolve, reject) {
             if(cmdObj.timeout) {
                 setTimeout(function() {
@@ -135,7 +135,7 @@ function commandUtilFactory(
             }
             var ssh = sshClient;
             ssh.on('ready', function() {
-                ssh.exec(cmdObj.cmd, function(err, stream) {
+                ssh.exec(cmdObj.cmd, execOptions || {}, function(err, stream) {
                     if (err) { reject(err); }
                     stream.on('close', function(code) {
                         cmdObj.exitCode = code;