Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 4.1] Checking TOSCA value RawString() to see if property execution_option is defined #749

Merged
merged 1 commit into from
Jun 11, 2021
+2 −5
Merged

[Backport 4.1] Checking TOSCA value RawString() to see if property execution_option is defined #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion prov/slurm/execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down