Merge branch 'reservation' into 'master'

Reservation

See merge request openmole/openmole!11

libraries/build.sbt

@@ -359,7 +359,7 @@ lazy val effectaside = OsgiProject(dir, "effectaside", imports = Seq("*")) setti
   version := effectasideVersion
 )
 
-def gridscaleVersion = "2.19"
+def gridscaleVersion = "2.21"
 lazy val gridscale = OsgiProject(dir, "gridscale", imports = Seq("*"), exports = Seq("gridscale.*", "enumeratum.*")) settings (
   libraryDependencies += "fr.iscpif.gridscale" %% "gridscale" % gridscaleVersion,
   version := gridscaleVersion

openmole/plugins/org.openmole.plugin.environment.slurm/src/main/scala/org/openmole/plugin/environment/slurm/SLURMEnvironment.scala

@@ -43,6 +43,7 @@ object SLURMEnvironment {
     constraints:          Seq[String]                   = List(),
     nodes:                OptionalArgument[Int]         = None,
     nTasks:               OptionalArgument[Int]         = None,
+    reservation:          OptionalArgument[String]      = None,
     coresByNode:          OptionalArgument[Int]         = None,
     sharedDirectory:      OptionalArgument[String]      = None,
     workDirectory:        OptionalArgument[String]      = None,
@@ -67,6 +68,7 @@ object SLURMEnvironment {
       nodes = nodes,
       coresByNode = coresByNode,
       nTasks = nTasks,
+      reservation = reservation,
       sharedDirectory = sharedDirectory,
       workDirectory = workDirectory,
       threads = threads,
@@ -112,6 +114,7 @@ object SLURMEnvironment {
     nodes:                Option[Int],
     coresByNode:          Option[Int],
     nTasks:               Option[Int],
+    reservation:          Option[String],
     sharedDirectory:      Option[String],
     workDirectory:        Option[String],
     threads:              Option[Int],

openmole/plugins/org.openmole.plugin.environment.slurm/src/main/scala/org/openmole/plugin/environment/slurm/SLURMJobService.scala

@@ -46,7 +46,8 @@ class SLURMJobService[S, H](
       coresByNode = parameters.coresByNode orElse parameters.threads,
       qos = parameters.qos,
       gres = parameters.gres.toList,
-      constraints = parameters.constraints.toList
+      constraints = parameters.constraints.toList,
+      reservation = parameters.reservation
     )
 
     accessControl { gridscale.slurm.submit(h, description) }

openmole/project/Libraries.scala

@@ -5,7 +5,7 @@ import sbt._
 
 object Libraries {
 
-  lazy val gridscaleVersion = "2.19"
+  lazy val gridscaleVersion = "2.21"
   lazy val sshjVersion = "0.27.0"
 
   lazy val mgoVersion = "3.28"