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

Bugfix/gh 739 slurm execution option #740

Merged
merged 2 commits into from
May 25, 2021
Merged

Bugfix/gh 739 slurm execution option #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9796b4f
Checking TOSCA value RawString() to see if property execution_options…
laurentganne May 25, 2021
1d0480e
Updated changelog
laurentganne May 25, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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