Author: chatellier Date: 2009-11-27 10:12:49 +0000 (Fri, 27 Nov 2009) New Revision: 2776 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Log: Fix pbs multijob script (missing index, bad small id) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-11-24 10:29:06 UTC (rev 2775) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-11-27 10:12:49 UTC (rev 2776) @@ -878,7 +878,7 @@ if (simulationItem.isLastSimulation()) { - String shortSimulationId = simulationid.substring(simulationid.lastIndexOf('_') + 1); + String shortSimulationId = simulationid.substring(0, simulationid.lastIndexOf('_')); if (log.isDebugEnabled()) { log.debug("Last simulation start requested, send multijob start request for " + shortSimulationId); Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2009-11-24 10:29:06 UTC (rev 2775) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2009-11-27 10:12:49 UTC (rev 2776) @@ -8,7 +8,7 @@ <#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> - <#assign localsimulationid='${simulationid}' /> + <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' /> <#assign localsimulationzip='${simulationzip?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> <#assign localsimulationresultzip='${simulationresultzip?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> <#assign localsimulationprescript='${simulationprescript?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-11-24 10:29:06 UTC (rev 2775) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-11-27 10:12:49 UTC (rev 2776) @@ -186,7 +186,7 @@ public void testFreemarkerTemplateMultiJobsAndScript() throws IOException, TemplateException { - String shortSimulationId = "sim_test1_2009-11-10-18-08"; + String shortSimulationId = "as_blah_2009-11-27-10-39"; String simulationId = shortSimulationId + "_122"; String simulationZip = "simulation-" + simulationId + "-preparation.zip"; String simulationResultZip = "/tmp/simulation-" + simulationId + "-result.zip"; @@ -204,7 +204,7 @@ } // simulation parameters - Assert.assertTrue("String \"" + shortSimulationId + "\" not found in template", content.indexOf(shortSimulationId) > 0); + Assert.assertTrue("String \"" + shortSimulationId + "\" not found in template", content.indexOf(shortSimulationId + "_$PBS_ARRAY_INDEX\"") > 0); Assert.assertTrue(content.indexOf("simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-preparation.zip") > 0); Assert.assertTrue(content.indexOf("/tmp/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-result.zip") > 0); Assert.assertTrue(content.indexOf("simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-prescript.bsh") > 0);