Closed marcoag closed 5 months ago
I didn't manage to run a it seems to pass for git subtree pull --prefix ros2_batch_job/vendor/osrf_pycommon osrf_pycommon_upstream master
to update the subtree. I used some git merge command to run an update but I kept it on a separate branch for now in case there's a proper way to do the subtree update. The branch is https://github.com/ros2/ci/tree/marcoag/add_noble_reset_subtree andRolling
with the latest changes :
test_ci_linux:
test_ci_linux-aarch64:
test_packaging_linux:
test_packaging_linux-aarch64:
Edit: I managed to manually update the subtree and create a manual squash merge commit that is usable by the git subtree
tool so I guess that works. I rerun the jobs above for this specific branch. I will send a separate PR with hints on how to do a manual subtree update.
I realized if we Squash and merge
this we would loose the subtree commit which is undesirable. Maybe once we are good with the PR I can do a rebase to squash all commits into one and keep the subtree update so we can just run a merge without squashing afterwards.
Overall, this looks great to me.
I'm going to suggest running a couple more pieces of CI on this, because of the change to ros2_batch_job/util.py.
In particular, we are still using old versions of Python on both Rolling Windows (Python 3.8.3), and on Humble RHEL-8 (3.6). So it is possible that we will run into problems on those platforms. So please run CI with this branch on both of those. Once we confirm that those are good, I'm happy to approve and merge this PR. Thanks!
Windows Debug is failing, but that is a completely different issue unrelated to this PR.
This otherwise looks good to me. I'm going to approve it, merge it in, and deploy it so we get a full day of running it to be sure it still works.
And this is now deployed!
Starting this PR to gather feedback.
I believe with should hold the merge until the bootstrap repository step is done.
Note that: