From bb6613b8b4a75c1d0d7f7688b532633c5e755f94 Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Fri, 12 May 2017 16:26:58 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@148632 82a268e6-3cf1-43bd-a215-b396298e98cf --- src/main/resources/service.properties | 2 +- .../dataminerpoolmanager/JobTest.java | 18 +++++------------- .../dataminerpoolmanager/SVNUpdaterTest.java | 2 -- 3 files changed, 6 insertions(+), 16 deletions(-) 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 db8788a..7d2e20b 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 ***REMOVED*** 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 97333ef..d9c4d04 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 ***REMOVED*** public static void main(String[] args) throws SVNException, IOException ***REMOVED*** 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";