Merge pull request #22 from bparees/master

allow for optional specification of jar cache path via JENKINS_JAR_CACHE_PATH
openshift · Apr 4, 2014 · 0aff8c5 · 0aff8c5
2 parents 200e551 + 1915d2e
commit 0aff8c5
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/java/hudson/plugins/openshift/OpenShiftComputerLauncher.java b/src/main/java/hudson/plugins/openshift/OpenShiftComputerLauncher.java
@@ -107,11 +107,16 @@ public void launch(SlaveComputer slaveComputer, TaskListener taskListener)
             String sshWrapperPath = "/usr/libexec/openshift/cartridges/jenkins/bin/git_ssh_wrapper.sh";
             ((ChannelExec) slaveChannel).setEnv("GIT_SSH", sshWrapperPath);
             ((ChannelExec) slaveChannel).setAgentForwarding(true);
-            ((ChannelExec) slaveChannel)
-                    .setCommand("java -jar $OPENSHIFT_DATA_DIR/jenkins/slave.jar");
-            // jar-cache parameter needed for jenkins 1.540+
-            //((ChannelExec) slaveChannel)
-            //       .setCommand("java -jar $OPENSHIFT_DATA_DIR/jenkins/slave.jar -jar-cache $OPENSHIFT_DATA_DIR/.jenkins/cache/jars");
+            String jarCachePath=System.getenv("JENKINS_JAR_CACHE_PATH");
+            if(jarCachePath!=null) {
+                //jar-cache parameter needed for jenkins 1.540+
+                // recommended jar caceh path: $OPENSHIFT_DATA_DIR/.jenkins/cache/jars
+                ((ChannelExec) slaveChannel)
+                .setCommand("java -jar $OPENSHIFT_DATA_DIR/jenkins/slave.jar -jar-cache "+jarCachePath);
+            } else {
+                ((ChannelExec) slaveChannel)
+                        .setCommand("java -jar $OPENSHIFT_DATA_DIR/jenkins/slave.jar");
+            }
             InputStream serverOutput = slaveChannel.getInputStream();
             OutputStream clientInput = slaveChannel.getOutputStream();
             slaveChannel.connect();