Merge pull request #1621 from virtualcell/dan-ss-mantis-node

we now read the slurm node from property

Author: danv61

vcell-server/src/main/java/cbit/vcell/message/server/htc/slurm/SlurmProxy.java

@@ -1012,6 +1012,10 @@ private void slurmBatchScriptInit(String jobName, boolean isPowerUser, MemLimitR
 		lsb.write("#SBATCH --mem-per-cpu=" + memoryMBAllowed.getMemLimit() + "M");
 		lsb.write("#SBATCH --nodes=1");
 		lsb.write("#SBATCH --time=" + jobTimeout + "\t\t# timeout for the entire job");
+		String nodelist = PropertyLoader.getProperty(PropertyLoader.htcNodeList, null);
+		if (nodelist!=null && nodelist.trim().length()>0) {
+			lsb.write("#SBATCH --nodelist="+nodelist);
+		}
 		lsb.write("#SBATCH --no-kill");
 		lsb.write("#SBATCH --no-requeue");
 

vcell-server/src/test/java/cbit/vcell/message/server/htc/slurm/SlurmProxyTest.java

@@ -290,6 +290,7 @@ public void testSimJobScriptLangevin() throws IOException, XmlParseException, Ex
 	@Test
 	public void testSimJobScriptLangevinBatch() throws IOException, XmlParseException, ExpressionException {
 		setProperty(PropertyLoader.htc_vcellopt_docker_name, "ghcr.io/virtualcell/vcell-opt:7.7.0.39");
+		setProperty(PropertyLoader.htcNodeList, "mantis-040");
 		setProperty(PropertyLoader.vcellSoftwareVersion, "Rel_Version_7.7.0_build_39");
 		setProperty(PropertyLoader.vcellServerIDProperty,"TEST2");
 		setProperty(PropertyLoader.jmsSimHostExternal, "k8s-wn-01.cam.uchc.edu");

vcell-server/src/test/resources/slurm_fixtures/langevin/V_TEST2_999999999_0_0.slurm.sub

@@ -10,6 +10,7 @@
 #SBATCH --mem-per-cpu=4096M
 #SBATCH --nodes=1
 #SBATCH --time=6-14:24:00		# timeout for the entire job
+#SBATCH --nodelist=mantis-040
 #SBATCH --no-kill
 #SBATCH --no-requeue