Merge pull request #749 from ystia/backport41/bugfix/GH-739-slurm-exe…

…cution-option [Backport 4.1] Checking TOSCA value RawString() to see if property execution_option is defined
ystia · Jun 11, 2021 · 5d862bb · 5d862bb
2 parents b721fc9 + 33269e6
commit 5d862bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,13 +5,10 @@
 ### BUG FIXES
 
 * Over-consumption of Consul connections ([GH-745](https://github.com/ystia/yorc/issues/745))
+* Error submitting a SLURM job with no execution option ([GH-739](https://github.com/ystia/yorc/issues/739))
 
 ## 4.1.1 (May 06, 2021)
 
-### ENHANCEMENTS
-
-* Support Alien4Cloud 3.2.0 ([GH-723](https://github.com/ystia/yorc/issues/723))
-
 ### BUG FIXES
 
 * Can't bootstrap Yorc as BinTray is now unavailable ([GH-727](https://github.com/ystia/yorc/issues/727))

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)