diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java index 4d6c5f5..c2d9c21 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java @@ -79,6 +79,38 @@ public class RestPoolManager implements PoolManager { ***REMOVED*** ***REMOVED*** + + + + ***REMOVED***Production Testing + /* + stageAlgorithm(Rproto caller token,pacchetto, category) + http:***REMOVED***node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/algorithm/stage?gcube-token=3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462&algorithmPackageURL=http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=ICHTHYOP_MODEL + + + publishAlgorithm(Rproto caller token, pacchetto, category, target token, target prod vre) + http:***REMOVED***node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/algorithm/stage/add?gcube-token=3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462&algorithmPackageURL=http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=ICHTHYOP_MODEL&targetVREToken=708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548&targetVRE=/gcube/devNext/NextNext + + + getLogById(Rproto caller token, logid) + http:***REMOVED***node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/log?gcube-token=3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462&logUrl= + */ + + + ***REMOVED***dev Testing + /* + stageAlgorithm(dev caller token,pacchetto, category) + http:***REMOVED***node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/algorithm/stage?gcube-token=708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548&algorithmPackageURL=http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=ICHTHYOP_MODEL + + + publishAlgorithm(dev caller token, pacchetto, category, target token, target prod vre) + http:***REMOVED***node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/algorithm/stage/add?gcube-token=708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548&algorithmPackageURL=http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=ICHTHYOP_MODEL&targetVREToken=3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462&targetVRE=/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab + + + getLogById(dev caller token, logid) + http:***REMOVED***node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/log?gcube-token=708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548&logUrl= + */ + @Override public void getLogId(Algorithm algo, String vre) { diff --git a/src/main/resources/service.properties b/src/main/resources/service.properties index 9f72b04..915900b 100644 --- a/src/main/resources/service.properties +++ b/src/main/resources/service.properties @@ -1,5 +1,5 @@ #YML node file -#STAGING_HOST: dataminer-proto-ghost.d4science.org +#STAGING_HOST: dataminer-proto-ghost.d4science.org STAGING_HOST: dataminer1-devnext.d4science.org SVN_REPO: https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/ #HAPROXY_CSV: http:***REMOVED***data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0 diff --git a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java index 4a87a4c..c4dcfbc 100644 --- a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java +++ b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java @@ -19,27 +19,19 @@ public class JobTest { ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab"); - - SVNUpdater svnUpdater = new SVNUpdater("https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/"); - Algorithm algo = AlgorithmBuilder.create("http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0", "ICHTHYOP_MODEL"); - + ***REMOVED***test phase Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster(); - - Cluster rProtoCluster = ClusterBuilder.getRProtoCluster(); - - DMPMJob job = new StagingJob(svnUpdater, algo, stagingCluster, rProtoCluster); - job.start(); - -***REMOVED*** Cluster prodCluster = ClusterBuilder.getVRECluster(targetVREToken, targetVRE); -***REMOVED*** -***REMOVED*** DMPMJob job2 = new ProductionPublishingJob(svnUpdater, algo, prodCluster); + ***REMOVED***release phase + ***REMOVED***Cluster prodCluster = ClusterBuilder.getVRECluster(targetVREToken, targetVRE); + ***REMOVED***DMPMJob job2 = new ProductionPublishingJob(svnUpdater, algo, prodCluster); + ***REMOVED***job2.start(); ***REMOVED*** diff --git a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNUpdaterTest.java b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNUpdaterTest.java index aa15ba5..d4a8b5f 100644 --- a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNUpdaterTest.java +++ b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNUpdaterTest.java @@ -13,8 +13,6 @@ public class SVNUpdaterTest { public static void main(String[] args) throws SVNException, IOException { ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab"); - - SVNUpdater svnUpdater = new SVNUpdater("https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/"); String test = "testDep";