Skip to content

Commit

Permalink
apptainer regex needs * to pick up all characters (#794)
Browse files Browse the repository at this point in the history
* apptainer regex needs * to pick up all characters

* go ahead and bump the version too, bc we're releasing today

* fix these links
  • Loading branch information
johrstrom committed Feb 2, 2023
1 parent b4debc6 commit cfecc33
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [0.23.2] - 02-02-2023

### Fixed

- The linux host adapter should correctly extract the full apptainer pid in [794](https://github.com/OSC/ood_core/pull/794).


## [0.23.1] - 02-01-2023

### Fixed
Expand Down Expand Up @@ -479,8 +486,9 @@ Functionally the same as [0.17.3] but with some CI updates.
### Added
- Initial release!

[Unreleased]: https://github.com/OSC/ood_core/compare/v0.23.1...HEAD
[0.23.1]: https://github.com/OSC/ood_core/compare/v0.22.0...v0.23.0
[Unreleased]: https://github.com/OSC/ood_core/compare/v0.23.2...HEAD
[0.23.2]: https://github.com/OSC/ood_core/compare/v0.23.1...v0.23.2
[0.23.1]: https://github.com/OSC/ood_core/compare/v0.23.0...v0.23.1
[0.23.0]: https://github.com/OSC/ood_core/compare/v0.22.0...v0.23.0
[0.22.0]: https://github.com/OSC/ood_core/compare/v0.21.0...v0.22.0
[0.21.0]: https://github.com/OSC/ood_core/compare/v0.20.2...v0.21.0
Expand Down
2 changes: 1 addition & 1 deletion lib/ood_core/job/adapters/linux_host/launcher.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def stop_remote_session(session_name, hostname)
# Get the tmux pane PID for the target session
pane_pid=$(tmux list-panes -aF '\#{session_name} \#{pane_pid}' | grep '#{session_name}' | cut -f 2 -d ' ')
# Find the Singularity sinit PID child of the pane process
pane_sinit_pid=$(pstree -p -l "$pane_pid" | egrep -o 'sinit[(][[:digit:]]*|shim-init[(][[:digit:]]|appinit[(][[:digit:]]' | grep -o '[[:digit:]]*')
pane_sinit_pid=$(pstree -p -l "$pane_pid" | egrep -o 'sinit[(][[:digit:]]*|shim-init[(][[:digit:]]|appinit[(][[:digit:]]*' | grep -o '[[:digit:]]*')
# Kill sinit which stops both Singularity-based processes and the tmux session
kill "$pane_sinit_pid"
SCRIPT
Expand Down
2 changes: 1 addition & 1 deletion lib/ood_core/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module OodCore
# The current version of {OodCore}
VERSION = "0.23.1"
VERSION = "0.23.2"
end

0 comments on commit cfecc33

Please sign in to comment.