Skip to content

Backport #154 to jazzy - #155

Merged
aaronchongth merged 1 commit into
open-rmf:jazzyfrom
HappySamuel:backport/154-jazzy
Nov 11, 2026
Merged

aaronchongth merged 1 commit into
open-rmf:jazzyfrom
HappySamuel:backport/154-jazzy

Conversation

@HappySamuel

Copy link
Copy Markdown
Contributor

Backport

Fixes #146 on jazzy: rewind_task never rewinds. With the apt Jazzy binaries (ros-jazzy-rmf-task-sequence 2.5.1), rewinding to a later completed phase hangs the fleet adapter.

The cherry-pick applies cleanly. Before #154, Task.cpp and test_Sequence.cpp were identical on jazzy, lyrical and main, so this is the same change as on main. The commit carries (cherry picked from commit c9f7201...).

Testing

  • colcon build --packages-select rmf_task rmf_task_sequence of this branch on Ubuntu 24.04 / Jazzy, then test_rmf_task_sequence: all tests pass (359 assertions in 6 test cases), including the new "Rewind a task to an earlier phase" scenario.
  • The rmf_demos results in Fix Task::Active::rewind() so it actually rewinds #154 were run against main.

GenAI Use

We follow OSRA's policy on GenAI tools

  • I used a GenAI tool in this PR.
  • I did not use GenAI

Generated-by: Claude Code (Claude Opus 5.5) was used to cherry-pick the change, run the tests and draft this description. I reviewed the changes and results.

🤖 Generated with Claude Code

@mxgrey mxgrey added this to PMC Board Nov 3, 2026
@github-project-automation github-project-automation Bot moved this to Inbox in PMC Board Nov 3, 2026
@HappySamuel HappySamuel mentioned this pull request Nov 3, 2026
1 of 2 tasks
@HappySamuel

Copy link
Copy Markdown
Contributor Author

The asan/tsan failures are the existing jazzy CI issue: the rolling job can't find eigen3_cmake_module when configuring rmf_task, the same failure as on #152, so nothing gets built.

The rewind change and its tests are the same in #156 (lyrical), whose CI passes on all four distros, including the jazzy/noble asan and tsan jobs. This branch also builds and passes all test_rmf_task_sequence tests locally on Ubuntu 24.04 / Jazzy.

@HappySamuel

HappySamuel commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor Author

@aaronchongth @mxgrey A gentle ping on the backports of #154 (the rewind_task fix for #146): this PR for jazzy and #156 for lyrical. Both are clean cherry-picks of the merged commit.

If you'd rather fold this into your next batch backport like #152, that works for me too.

@aaronchongth

aaronchongth commented Nov 10, 2026 •

Copy link
Copy Markdown
Member

@HappySamuel sorry for the late reply, I just learnt that our CI was disabled due to inactivity for 6 months+ (commits), even scheduled workflows were disabled automatically. I just enabled them back up, can you run an empty commit to trigger CI again? Thanks!

edit: this applies to the backport to lyrical PR as well

@HappySamuel HappySamuel mentioned this pull request Nov 11, 2026
1 of 2 tasks
@HappySamuel

Copy link
Copy Markdown
Contributor Author

@aaronchongth Thanks for re-enabling CI! I pushed an empty commit to both PRs. #156 (lyrical) is now all green.

On this one, all three jobs fail before rmf_task is compiled. The cause is the jazzy branch's workflows: they still build against rolling on noble, and since rolling moved to resolute, rosdep can't resolve anything on noble. That's also why the build job failed this time, after passing on Nov 3. (Correcting my earlier comment: there was never a jazzy job here, only rolling ones.)

I opened #157 to switch the jazzy branch workflows to jazzy / noble, like rmf_ros2's jazzy branch. Once that's in, CI on this PR should pass.

@aaronchongth

Copy link
Copy Markdown
Member

that makes sense, thanks for setting that up. I've merged #157, you would probably need to rebase, to get this CI to run properly

Signed-off-by: HappySamuel <18137963+HappySamuel@users.noreply.github.com>
Assisted-by: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit c9f7201)

@aaronchongth aaronchongth left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@aaronchongth
aaronchongth merged commit 47275cf into open-rmf:jazzy Nov 11, 2026
4 checks passed
@github-project-automation github-project-automation Bot moved this from Inbox to Done in PMC Board Nov 11, 2026
@HappySamuel
HappySamuel deleted the backport/154-jazzy branch November 11, 2026 03:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants