This commit is contained in:
Nunzio Andrea Galante 2017-07-07 13:57:46 +00:00
parent 3f14889b58
commit 3054b0a4ca
4 changed files with 130 additions and 63 deletions

View File

@ -28,7 +28,7 @@ public class ProductionPublishingJob extends DMPMJob ***REMOVED***
if (CheckPermission.apply(targetVREToken,targetVREName))***REMOVED*** if (CheckPermission.apply(targetVREToken,targetVREName))***REMOVED***
this.svnUpdater.updateProdDeps(this.algorithm); ***REMOVED***this.svnUpdater.updateProdDeps(this.algorithm);
this.svnUpdater.updateSVNProdAlgorithmList(this.algorithm, this.targetVREName, this.algorithm.getFullname(), "Prod"); this.svnUpdater.updateSVNProdAlgorithmList(this.algorithm, this.targetVREName, this.algorithm.getFullname(), "Prod");

View File

@ -33,32 +33,32 @@ public class SVNUpdater ***REMOVED***
this.configuration = configuration; this.configuration = configuration;
***REMOVED*** ***REMOVED***
public void updateRPRotoDeps(Algorithm algorithm) ***REMOVED*** ***REMOVED*** public void updateRPRotoDeps(Algorithm algorithm) ***REMOVED***
this.updateSVN(this.configuration.getSVNRProtoOSDepsList(), algorithm.getOSDependencies()); ***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoOSDepsList(), algorithm.getOSDependencies());
this.updateSVN(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getCranDependencies()); ***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getCranDependencies());
this.updateSVN(this.configuration.getSVNRProtoGitHubDepsList(), algorithm.getGitHubDependencies()); ***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoGitHubDepsList(), algorithm.getGitHubDependencies());
***REMOVED*** ***REMOVED******REMOVED***
public String getRProtoDependencyFile(String language) ***REMOVED*** public String getRProtoDependencyFile(String language) ***REMOVED***
switch (language) ***REMOVED*** switch (language) ***REMOVED***
case "R": case "R":
return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProtoCRANDepsList();
***REMOVED*** case "R-blackbox": case "R-blackbox":
***REMOVED*** return ""; return this.configuration.getSVNRProtoRBDepsList();
***REMOVED*** case "Java": case "Java":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProtoJavaDepsList();
case "Knime-Workflow": case "Knime-Workflow":
return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProtoKWDepsList();
***REMOVED*** case "Linux-compiled": case "Linux-compiled":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProtoLinuxCompiledDepsList();
***REMOVED*** case "Octave": case "Octave":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProtoOctaveDepsList();
***REMOVED*** case "Python": case "Python":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProtoPythonDepsList();
***REMOVED*** case "Pre-Installed": case "Pre-Installed":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProtoPreInstalledDepsList();
***REMOVED*** case "Windows-compiled": case "Windows-compiled":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProtoWCDepsList();
default: default:
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***
@ -70,32 +70,28 @@ public class SVNUpdater ***REMOVED***
switch (language) ***REMOVED*** switch (language) ***REMOVED***
case "R": case "R":
return this.configuration.getSVNRProdCRANDepsList(); return this.configuration.getSVNRProdCRANDepsList();
***REMOVED*** case "R-blackbox": case "R-blackbox":
***REMOVED*** return ""; return this.configuration.getSVNRProdRBDepsList();
***REMOVED*** case "Java": case "Java":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProdJavaDepsList();
***REMOVED*** case "Knime-Workflow": case "Knime-Workflow":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProdKWDepsList();
***REMOVED*** case "Linux-compiled": case "Linux-compiled":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProdLinuxCompiledDepsList();
***REMOVED*** case "Octave": case "Octave":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProdOctaveDepsList();
***REMOVED*** case "Python": case "Python":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProdPythonDepsList();
***REMOVED*** case "Pre-Installed": case "Pre-Installed":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProdPreInstalledDepsList();
***REMOVED*** case "Windows-compiled": case "Windows-compiled":
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); return this.configuration.getSVNRProdWCDepsList();
default: default:
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***
public void readRPRotoDeps(Algorithm algorithm) throws SVNException ***REMOVED*** public void readRPRotoDeps(Algorithm algorithm) throws SVNException ***REMOVED***
if (algorithm.getLanguage().equals("R")) ***REMOVED*** if (algorithm.getLanguage().equals("R")) ***REMOVED***
@ -157,11 +153,11 @@ public class SVNUpdater ***REMOVED***
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***
public void updateProdDeps(Algorithm algorithm) ***REMOVED*** ***REMOVED*** public void updateProdDeps(Algorithm algorithm) ***REMOVED***
this.updateSVN(this.configuration.getSVNProdOSDepsList(), algorithm.getOSDependencies()); ***REMOVED*** this.updateSVN(this.configuration.getSVNProdOSDepsList(), algorithm.getOSDependencies());
this.updateSVN(this.configuration.getSVNRProdCRANDepsList(), algorithm.getCranDependencies()); ***REMOVED*** this.updateSVN(this.configuration.getSVNRProdCRANDepsList(), algorithm.getCranDependencies());
this.updateSVN(this.configuration.getSVNRProdGitHubDepsList(), algorithm.getGitHubDependencies()); ***REMOVED*** this.updateSVN(this.configuration.getSVNRProdGitHubDepsList(), algorithm.getGitHubDependencies());
***REMOVED*** ***REMOVED******REMOVED***
public void updateSVNRProtoAlgorithmList(Algorithm algorithm, String targetVRE, String user, String env) ***REMOVED*** public void updateSVNRProtoAlgorithmList(Algorithm algorithm, String targetVRE, String user, String env) ***REMOVED***
this.updateSVNAlgorithmList(this.configuration.getSVNRProtoAlgorithmsList(), algorithm, targetVRE, user, env); this.updateSVNAlgorithmList(this.configuration.getSVNRProtoAlgorithmsList(), algorithm, targetVRE, user, env);

View File

@ -39,38 +39,95 @@ public class ServiceConfiguration ***REMOVED***
public String getSVNRepository()***REMOVED*** public String getSVNRepository()***REMOVED***
return props.getProperty("svn.repository"); return props.getProperty("svn.repository");
***REMOVED*** ***REMOVED***
***REMOVED***RProto
public String getSVNRProtoAlgorithmsList()***REMOVED*** public String getSVNRProtoAlgorithmsList()***REMOVED***
return props.getProperty("svn.rproto.algorithms-list"); return props.getProperty("svn.rproto.algorithms-list");
***REMOVED*** ***REMOVED***
public String getSVNRProtoOSDepsList()***REMOVED*** public String getSVNRProtoLinuxCompiledDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-os"); return props.getProperty("svn.rproto.deps-linux-compiled");
***REMOVED*** ***REMOVED***
public String getSVNRProtoCRANDepsList()***REMOVED*** public String getSVNRProtoCRANDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-cran"); return props.getProperty("svn.rproto.deps-r");
***REMOVED*** ***REMOVED***
public String getSVNRProtoGitHubDepsList()***REMOVED*** public String getSVNRProtoPreInstalledDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-github"); return props.getProperty("svn.rproto.deps-pre-installed");
***REMOVED***
public String getSVNRProtoRBDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-r-blackbox");
***REMOVED***
public String getSVNRProtoJavaDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-java");
***REMOVED***
public String getSVNRProtoKWDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-knime-workflow");
***REMOVED***
public String getSVNRProtoOctaveDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-octave");
***REMOVED***
public String getSVNRProtoPythonDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-python");
***REMOVED***
public String getSVNRProtoWCDepsList()***REMOVED***
return props.getProperty("svn.rproto.deps-windows-compiled");
***REMOVED*** ***REMOVED***
***REMOVED***Prod
public String getSVNProdAlgorithmsList()***REMOVED*** public String getSVNProdAlgorithmsList()***REMOVED***
return props.getProperty("svn.prod.algorithms-list"); return props.getProperty("svn.prod.algorithms-list");
***REMOVED*** ***REMOVED***
public String getSVNProdOSDepsList()***REMOVED*** public String getSVNRProdLinuxCompiledDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-os"); return props.getProperty("svn.prod.deps-linux-compiled");
***REMOVED*** ***REMOVED***
public String getSVNRProdCRANDepsList()***REMOVED*** public String getSVNRProdCRANDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-cran"); return props.getProperty("svn.prod.deps-r");
***REMOVED*** ***REMOVED***
public String getSVNRProdGitHubDepsList()***REMOVED*** public String getSVNRProdPreInstalledDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-github"); return props.getProperty("svn.prod.deps-pre-installed");
***REMOVED*** ***REMOVED***
public String getSVNRProdRBDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-r-blackbox");
***REMOVED***
public String getSVNRProdJavaDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-java");
***REMOVED***
public String getSVNRProdKWDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-knime-workflow");
***REMOVED***
public String getSVNRProdOctaveDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-octave");
***REMOVED***
public String getSVNRProdPythonDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-python");
***REMOVED***
public String getSVNRProdWCDepsList()***REMOVED***
return props.getProperty("svn.prod.deps-windows-compiled");
***REMOVED***
public String getCSVUrl() ***REMOVED*** public String getCSVUrl() ***REMOVED***
return props.getProperty("HAPROXY_CSV"); return props.getProperty("HAPROXY_CSV");

View File

@ -7,13 +7,27 @@ SVN_REPO: https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube/tru
svn.repository = https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube svn.repository = https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube
svn.rproto.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/algorithms svn.rproto.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/algorithms
svn.rproto.deps-os = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_deb_pkgs.txt
svn.rproto.deps-cran = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_cran_pkgs.txt svn.rproto.deps-linux-compiled =
svn.rproto.deps-github = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_github_pkgs.txt svn.rproto.deps-pre-installed =
svn.rproto.deps-r-blackbox =
svn.rproto.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_cran_pkgs.txt
svn.rproto.deps-java =
svn.rproto.deps-knime-workflow =
svn.rproto.deps-octave =
svn.rproto.deps-python =
svn.rproto.deps-windows-compiled =
svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms
svn.prod.deps-os = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.prod.deps-cran = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt svn.prod.deps-linux-compiled =
svn.prod.deps-github = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt svn.prod.deps-pre-installed =
svn.prod.deps-r-blackbox =
svn.prod.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.prod.deps-java =
svn.prod.deps-knime-workflow =
svn.prod.deps-octave =
svn.prod.deps-python =
svn.prod.deps-windows-compiled =