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

laurentganne · web-flow · commit dc281efce98d · 2021-05-25T14:42:13.000+02:00
Bugfix/gh 739 slurm execution option
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)

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ func (e *executionCommon) buildJobInfo(ctx context.Context) error {`
`380`	`380`	`if err != nil {`
`381`	`381`	`return err`
`382`	`382`	`}`
`383`		`- if eo != nil && eo.Value != nil {`
	`383`	`+ if eo != nil && eo.RawString() != "" {`
`384`	`384`	`err = mapstructure.Decode(eo.Value, &e.jobInfo.ExecutionOptions)`
`385`	`385`	`if err != nil {`
`386`	`386`	return errors.Wrapf(err, `invalid execution options datatype for attribute "execution_options" for node %q`, e.NodeName)