Merge pull request #98 from mafraba/ssh-user-variable

[JENKINS-44319] SSH user variable
jenkinsci · May 17, 2017 · ddd86a8 · ddd86a8
2 parents 724f231 + 3a27584
commit ddd86a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/msi/build-on-jenkins.sh b/msi/build-on-jenkins.sh
@@ -26,6 +26,9 @@ CLI_SSH_ARGS=
 if [ "x$JENKINS_SSH_KEY" != x ]; then
   CLI_SSH_ARGS="-i $JENKINS_SSH_KEY"
 fi
+if [ "x$JENKINS_SSH_USER" != x ]; then
+  CLI_SSH_ARGS="$CLI_SSH_ARGS -ssh -user $JENKINS_SSH_USER"
+fi
 
 case "$(uname)" in
   CYGWIN*)

diff --git a/osx/build-on-jenkins.sh b/osx/build-on-jenkins.sh
@@ -28,7 +28,9 @@ CLI_SSH_ARGS=
 if [ "x$JENKINS_SSH_KEY" != x ]; then
   CLI_SSH_ARGS="-i $JENKINS_SSH_KEY"
 fi
-
+if [ "x$JENKINS_SSH_USER" != x ]; then
+  CLI_SSH_ARGS="$CLI_SSH_ARGS -ssh -user $JENKINS_SSH_USER"
+fi
 
 java -jar $TARGET/jenkins-cli.jar $CLI_SSH_ARGS dist-fork -z $D/script.tgz \
   -f binary/${ARTIFACTNAME}.war="${WAR}" \