git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@150919 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Nunzio Andrea Galante
parent
9247b7019d
commit
3b7f4aefc4
|
|
@ -28,7 +28,7 @@ public class ProductionPublishingJob extends DMPMJob {
|
|||
|
||||
if (CheckPermission.apply(targetVREToken,targetVREName)){
|
||||
|
||||
this.svnUpdater.updateProdDeps(this.algorithm);
|
||||
***REMOVED***this.svnUpdater.updateProdDeps(this.algorithm);
|
||||
|
||||
this.svnUpdater.updateSVNProdAlgorithmList(this.algorithm, this.targetVREName, this.algorithm.getFullname(), "Prod");
|
||||
|
||||
|
|
|
|||
|
|
@ -33,32 +33,32 @@ public class SVNUpdater {
|
|||
this.configuration = configuration;
|
||||
***REMOVED***
|
||||
|
||||
public void updateRPRotoDeps(Algorithm algorithm) {
|
||||
this.updateSVN(this.configuration.getSVNRProtoOSDepsList(), algorithm.getOSDependencies());
|
||||
this.updateSVN(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getCranDependencies());
|
||||
this.updateSVN(this.configuration.getSVNRProtoGitHubDepsList(), algorithm.getGitHubDependencies());
|
||||
***REMOVED***
|
||||
***REMOVED*** public void updateRPRotoDeps(Algorithm algorithm) {
|
||||
***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoOSDepsList(), algorithm.getOSDependencies());
|
||||
***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getCranDependencies());
|
||||
***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoGitHubDepsList(), algorithm.getGitHubDependencies());
|
||||
***REMOVED******REMOVED***
|
||||
|
||||
public String getRProtoDependencyFile(String language) {
|
||||
switch (language) {
|
||||
case "R":
|
||||
return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "R-blackbox":
|
||||
***REMOVED*** return "";
|
||||
***REMOVED*** case "Java":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
case "R-blackbox":
|
||||
return this.configuration.getSVNRProtoRBDepsList();
|
||||
case "Java":
|
||||
return this.configuration.getSVNRProtoJavaDepsList();
|
||||
case "Knime-Workflow":
|
||||
return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Linux-compiled":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Octave":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Python":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Pre-Installed":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Windows-compiled":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
return this.configuration.getSVNRProtoKWDepsList();
|
||||
case "Linux-compiled":
|
||||
return this.configuration.getSVNRProtoLinuxCompiledDepsList();
|
||||
case "Octave":
|
||||
return this.configuration.getSVNRProtoOctaveDepsList();
|
||||
case "Python":
|
||||
return this.configuration.getSVNRProtoPythonDepsList();
|
||||
case "Pre-Installed":
|
||||
return this.configuration.getSVNRProtoPreInstalledDepsList();
|
||||
case "Windows-compiled":
|
||||
return this.configuration.getSVNRProtoWCDepsList();
|
||||
default:
|
||||
return null;
|
||||
***REMOVED***
|
||||
|
|
@ -70,32 +70,28 @@ public class SVNUpdater {
|
|||
switch (language) {
|
||||
case "R":
|
||||
return this.configuration.getSVNRProdCRANDepsList();
|
||||
***REMOVED*** case "R-blackbox":
|
||||
***REMOVED*** return "";
|
||||
***REMOVED*** case "Java":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Knime-Workflow":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Linux-compiled":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Octave":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Python":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Pre-Installed":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
***REMOVED*** case "Windows-compiled":
|
||||
***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList();
|
||||
case "R-blackbox":
|
||||
return this.configuration.getSVNRProdRBDepsList();
|
||||
case "Java":
|
||||
return this.configuration.getSVNRProdJavaDepsList();
|
||||
case "Knime-Workflow":
|
||||
return this.configuration.getSVNRProdKWDepsList();
|
||||
case "Linux-compiled":
|
||||
return this.configuration.getSVNRProdLinuxCompiledDepsList();
|
||||
case "Octave":
|
||||
return this.configuration.getSVNRProdOctaveDepsList();
|
||||
case "Python":
|
||||
return this.configuration.getSVNRProdPythonDepsList();
|
||||
case "Pre-Installed":
|
||||
return this.configuration.getSVNRProdPreInstalledDepsList();
|
||||
case "Windows-compiled":
|
||||
return this.configuration.getSVNRProdWCDepsList();
|
||||
default:
|
||||
return null;
|
||||
***REMOVED***
|
||||
***REMOVED***
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public void readRPRotoDeps(Algorithm algorithm) throws SVNException {
|
||||
if (algorithm.getLanguage().equals("R")) {
|
||||
|
|
@ -157,11 +153,11 @@ public class SVNUpdater {
|
|||
***REMOVED***
|
||||
***REMOVED***
|
||||
|
||||
public void updateProdDeps(Algorithm algorithm) {
|
||||
this.updateSVN(this.configuration.getSVNProdOSDepsList(), algorithm.getOSDependencies());
|
||||
this.updateSVN(this.configuration.getSVNRProdCRANDepsList(), algorithm.getCranDependencies());
|
||||
this.updateSVN(this.configuration.getSVNRProdGitHubDepsList(), algorithm.getGitHubDependencies());
|
||||
***REMOVED***
|
||||
***REMOVED*** public void updateProdDeps(Algorithm algorithm) {
|
||||
***REMOVED*** this.updateSVN(this.configuration.getSVNProdOSDepsList(), algorithm.getOSDependencies());
|
||||
***REMOVED*** this.updateSVN(this.configuration.getSVNRProdCRANDepsList(), algorithm.getCranDependencies());
|
||||
***REMOVED*** this.updateSVN(this.configuration.getSVNRProdGitHubDepsList(), algorithm.getGitHubDependencies());
|
||||
***REMOVED******REMOVED***
|
||||
|
||||
public void updateSVNRProtoAlgorithmList(Algorithm algorithm, String targetVRE, String user, String env) {
|
||||
this.updateSVNAlgorithmList(this.configuration.getSVNRProtoAlgorithmsList(), algorithm, targetVRE, user, env);
|
||||
|
|
|
|||
|
|
@ -39,38 +39,95 @@ public class ServiceConfiguration {
|
|||
public String getSVNRepository(){
|
||||
return props.getProperty("svn.repository");
|
||||
***REMOVED***
|
||||
|
||||
|
||||
|
||||
***REMOVED***RProto
|
||||
public String getSVNRProtoAlgorithmsList(){
|
||||
return props.getProperty("svn.rproto.algorithms-list");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoOSDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-os");
|
||||
public String getSVNRProtoLinuxCompiledDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-linux-compiled");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoCRANDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-cran");
|
||||
return props.getProperty("svn.rproto.deps-r");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoGitHubDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-github");
|
||||
public String getSVNRProtoPreInstalledDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-pre-installed");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoRBDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-r-blackbox");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoJavaDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-java");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoKWDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-knime-workflow");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoOctaveDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-octave");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoPythonDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-python");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProtoWCDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-windows-compiled");
|
||||
***REMOVED***
|
||||
|
||||
|
||||
***REMOVED***Prod
|
||||
public String getSVNProdAlgorithmsList(){
|
||||
return props.getProperty("svn.prod.algorithms-list");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNProdOSDepsList(){
|
||||
return props.getProperty("svn.prod.deps-os");
|
||||
public String getSVNRProdLinuxCompiledDepsList(){
|
||||
return props.getProperty("svn.prod.deps-linux-compiled");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProdCRANDepsList(){
|
||||
return props.getProperty("svn.prod.deps-cran");
|
||||
return props.getProperty("svn.prod.deps-r");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProdGitHubDepsList(){
|
||||
return props.getProperty("svn.prod.deps-github");
|
||||
public String getSVNRProdPreInstalledDepsList(){
|
||||
return props.getProperty("svn.prod.deps-pre-installed");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProdRBDepsList(){
|
||||
return props.getProperty("svn.prod.deps-r-blackbox");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProdJavaDepsList(){
|
||||
return props.getProperty("svn.prod.deps-java");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProdKWDepsList(){
|
||||
return props.getProperty("svn.prod.deps-knime-workflow");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProdOctaveDepsList(){
|
||||
return props.getProperty("svn.prod.deps-octave");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProdPythonDepsList(){
|
||||
return props.getProperty("svn.prod.deps-python");
|
||||
***REMOVED***
|
||||
|
||||
public String getSVNRProdWCDepsList(){
|
||||
return props.getProperty("svn.prod.deps-windows-compiled");
|
||||
***REMOVED***
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public String getCSVUrl() {
|
||||
return props.getProperty("HAPROXY_CSV");
|
||||
|
|
|
|||
|
|
@ -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.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-github = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_github_pkgs.txt
|
||||
|
||||
svn.rproto.deps-linux-compiled =
|
||||
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.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-github = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt
|
||||
|
||||
svn.prod.deps-linux-compiled =
|
||||
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 =
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue