Skip to content
Permalink
Browse files
[FIXED JENKINS-7219] EC2 slaves fail to launch when using old (< 1.9)…
… configs
  • Loading branch information
Francis Upton IV committed Feb 15, 2012
1 parent 911f293 commit 98309095065189ad51033e80f5dea694ce2d9331
Showing 1 changed file with 2 additions and 1 deletion.
@@ -126,7 +126,8 @@ else if (bootstrapResult == SAMEUSER)
scp.put(Hudson.getInstance().getJnlpJars("slave.jar").readFully(),
"slave.jar","/tmp");

String launchString = "java " + computer.getNode().jvmopts + " -jar /tmp/slave.jar";
String jvmopts = computer.getNode().jvmopts;
String launchString = "java " + (jvmopts != null ? jvmopts : "") + " -jar /tmp/slave.jar";
logger.println("Launching slave agent: " + launchString);
final Session sess = conn.openSession();
sess.execCommand(launchString);

0 comments on commit 9830909

Please sign in to comment.