Merge pull request #740 from ystia/bugfix/GH-739-slurm-execution-option

Bugfix/gh 739 slurm execution option
ystia · May 25, 2021 · dc281ef · dc281ef
2 parents 8d7a40d + 1d0480e
commit dc281ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### BUG FIXES
 
+* Error submitting a SLURM job with no execution option ([GH-739](https://github.com/ystia/yorc/issues/739))
 * Workflow with asynchronous action never stops after another step failure  ([GH-733](https://github.com/ystia/yorc/issues/733))
 
 ## 4.2.0-milestone.1 (May 06, 2021)

diff --git a/prov/slurm/execution.go b/prov/slurm/execution.go
@@ -380,7 +380,7 @@ func (e *executionCommon) buildJobInfo(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	if eo != nil && eo.Value != nil {
+	if eo != nil && eo.RawString() != "" {
 		err = mapstructure.Decode(eo.Value, &e.jobInfo.ExecutionOptions)
 		if err != nil {
 			return errors.Wrapf(err, `invalid execution options datatype for attribute "execution_options" for node %q`, e.NodeName)