gCubeSystem
/
dataminer-pool-manager
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@144197 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Nunzio Andrea Galante 2017-02-23 14:28:31 +00:00
parent 50832d44b0
commit 2b7a83f81a
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java
View File

@ -43,7 +43,7 @@ public class AnsibleBridge ***REMOVED***
private String dpmRoot;
public AnsibleBridge() ***REMOVED***
this("/tmp/dataminer-pool-manager");
this(System.getProperty("user.home")+File.separator+"/gcube/dataminer-pool-manager");
***REMOVED***
public AnsibleBridge(String root) ***REMOVED***

4
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/datamodel/Algorithm.java
View File

@ -18,7 +18,7 @@ public class Algorithm ***REMOVED***
private String skipJava;
private String packageURL;
private Collection<Action> actions;
private Collection<Dependency> dependencies;
@ -113,4 +113,6 @@ public class Algorithm ***REMOVED***
this.skipJava = skipJava;
***REMOVED***
***REMOVED***

2
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java
View File

@ -214,7 +214,7 @@ public class DataminerPoolManager implements PoolManager ***REMOVED***
public URL getURLfromWorkerLog(String a) throws MalformedURLException, UnknownHostException***REMOVED***
File path = new File("/tmp/dataminer-pool-manager/work/" + File.separator + a+File.separator +"logs");
File path = new File(System.getProperty("user.home")+File.separator+"/gcube/dataminer-pool-manager/work");
path.mkdirs();
File n = new File(path + File.separator +a);

6
src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/AlgorithmPackageParserTest.java
View File

@ -17,7 +17,7 @@ public class AlgorithmPackageParserTest ***REMOVED***
private static int BUFFER_SIZE = 2048;
private void extractAllAlgorithms() throws IOException ***REMOVED***
public void extractAllAlgorithms() throws IOException ***REMOVED***
String url = "http:***REMOVED***svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/dev/algorithms";
List<String> commands = this.extractAddAlgorithmCommands(url);
AlgorithmSet algorithms = new AlgorithmSet();
@ -110,8 +110,8 @@ public class AlgorithmPackageParserTest ***REMOVED***
***REMOVED***
public static void main(String[] args) throws Exception ***REMOVED***
ProxySelector.setDefault(new PropertiesBasedProxySelector(
"/home/ngalante/.proxy-settings"));
***REMOVED*** ProxySelector.setDefault(new PropertiesBasedProxySelector(
***REMOVED*** "/home/ngalante/.proxy-settings"));
new AlgorithmPackageParserTest().extractAllAlgorithms();
***REMOVED***

2
src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/AnsibleWorkerTest.java
View File

@ -13,7 +13,7 @@ import org.gcube.dataanalysis.dataminer.poolmanager.ansible.model.RoleFile;
public class AnsibleWorkerTest ***REMOVED***
public static void main(String[] args) throws IOException ***REMOVED***
AnsibleWorker worker = new AnsibleWorker(new File("/tmp/dataminer-pool-manager/work/"+UUID.randomUUID().toString()));
AnsibleWorker worker = new AnsibleWorker(new File("/home/nagalante/gcube/dataminer-pool-manager/work/"+UUID.randomUUID().toString()));
System.out.println("created worker named " + worker.getWorkerId());

2
src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/DataminerPoolManagerTest.java
View File

@ -211,7 +211,7 @@ public class DataminerPoolManagerTest ***REMOVED***
ensemble.setAlgorithmType("transducerers");
ensemble.setPackageURL("http:***REMOVED***data.d4science.org/R0FqV2lNOW1jMkxuUEIrWXY4aUhvSENHSmVMQks4NjdHbWJQNStIS0N6Yz0");
ensemble.setClazz("org.gcube.dataanalysis.executor.rscripts.Ichthyopmodelonebyone");
ensemble.setSkipJava("test");
ensemble.setSkipJava("N");
ensemble.setDescription("test");
Dependency d = new Dependency();