JENKINS-18415: Can't run shining panda jobs in 1.519

jenkinsci · Jun 29, 2013 · 0e320e2 · 0e320e2
1 parent ef6792f
commit 0e320e2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/jenkins/plugins/shiningpanda/workspace/Workspace.java b/src/main/java/jenkins/plugins/shiningpanda/workspace/Workspace.java
@@ -31,7 +31,6 @@
 import hudson.model.Node;
 import hudson.model.Project;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -107,14 +106,24 @@ private void setHome(FilePath home)
         this.home = home;
     }
 
+    /**
+     * Folder containing the scripts on master
+     * 
+     * @return The folder containing the scripts
+     */
+    private FilePath getScriptsDir()
+    {
+        return Jenkins.getInstance().getRootPath().child("plugins").child("shiningpanda").child("scripts");
+    }
+
     /**
      * Get the VIRTUALENV module file on master.
      * 
      * @return The VIRTUALENV module file
      */
     public FilePath getMasterVirtualenvPy()
     {
-        return new FilePath(new File(getClass().getResource(VIRTUALENV).getFile()));
+        return getScriptsDir().child(VIRTUALENV);
     }
 
     /**
@@ -133,7 +142,7 @@ public FilePath getMasterVirtualenvPy()
      */
     public FilePath getMasterBootstrapPy()
     {
-        return new FilePath(new File(getClass().getResource(BOOTSTRAP).getFile()));
+        return getScriptsDir().child(BOOTSTRAP);
     }
 
     /**

diff --git a/...ugins/shiningpanda/workspace/bootstrap.py → src/main/webapp/scripts/bootstrap.py b/...ugins/shiningpanda/workspace/bootstrap.py → src/main/webapp/scripts/bootstrap.py
diff --git a/...gins/shiningpanda/workspace/virtualenv.py → src/main/webapp/scripts/virtualenv.py b/...gins/shiningpanda/workspace/virtualenv.py → src/main/webapp/scripts/virtualenv.py