Add noble as an Ubuntu distro of choice. #738

marcoag · 2024-01-15T05:34:39Z

Starting this PR to gather feedback.

I believe with should hold the merge until the bootstrap repository step is done.

Note that:

No ROS1 has been set.
The dockerfile will have noble for ROS Rolling.

clalancette · 2024-01-16T14:43:07Z

create_jenkins_job.py

@@ -120,7 +120,7 @@ def main(argv=None):
        'enable_coverage_default': 'false',
        'dont_notify_every_unstable_build': 'false',
        'build_timeout_mins': 0,
-        'ubuntu_distro': 'jammy',
+        'ubuntu_distro': 'noble',


We don't want to switch the default to noble yet, so let's leave this as jammy for now.

Changed back in 89f939d.

clalancette · 2024-01-16T14:43:43Z

linux_docker_resources/Dockerfile

@@ -94,7 +94,7 @@ RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} != humble \); then apt-
 # Iron uses python3-lttng, but then starting after Iron we switch to liblttng-ctl-dev.
 RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} = iron \); then apt-get update && apt-get install --no-install-recommends -y \
  python3-lttng; fi
-RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} = rolling \); then apt-get update && apt-get install --no-install-recommends -y \
+RUN if test \( ${UBUNTU_DISTRO} = noble -a ${ROS_DISTRO} = rolling \); then apt-get update && apt-get install --no-install-recommends -y \


Here, we want to support Rolling on both jammy and noble for now. So please update the conditional so either will work.

Updated in 89f939d.

clalancette · 2024-01-18T16:22:19Z

linux_docker_resources/Dockerfile

@@ -94,7 +94,7 @@ RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} != humble \); then apt-
 # Iron uses python3-lttng, but then starting after Iron we switch to liblttng-ctl-dev.
 RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} = iron \); then apt-get update && apt-get install --no-install-recommends -y \
  python3-lttng; fi
-RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} = rolling \); then apt-get update && apt-get install --no-install-recommends -y \
+RUN if test \(\( ${UBUNTU_DISTRO} = jammy -o ${UBUNTU_DISTRO} = noble \) -a ${ROS_DISTRO} = rolling \); then apt-get update && apt-get install --no-install-recommends -y \


After looking at this and thinking about it again, I think I steered you wrong. In particular, we don't need the UBUNTU_DISTRO check at all, we can really just get by with the ROS_DISTRO check. I'm going to push a new commit here that does that, along with simplifies a few of the above lines.

clalancette · 2024-01-18T16:27:43Z

OK, with the latest fixes, I think we can run some CI here. Even without a deploy, we can still test that the changes to the Dockerfile work, so here are some runs (all on Jammy):

Rolling: * Linux

Iron: * Linux

Humble: * Linux

clalancette

Looks good to me with green CI.

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

It is enough to just have the ROS_DISTRO checks here. Signed-off-by: Chris Lalancette <clalancette@gmail.com>

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

marcoag · 2024-01-30T17:15:02Z

I didn't manage to run a 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 and it seems to pass for Rolling with the latest changes :

test_ci_linux:

Jammy
Noble

test_ci_linux-aarch64:

Jammy
Noble

test_packaging_linux:

Jammy
Noble

test_packaging_linux-aarch64:

Jammy
Noble

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.

git-subtree-dir: ros2_batch_job/vendor/osrf_pycommon git-subtree-split: f65f8594161dcff276813d59d3c1145ce767bb75 Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

marcoag · 2024-01-31T05:56:34Z

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.

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

clalancette · 2024-01-31T14:40:37Z

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!

clalancette · 2024-01-31T18:55:06Z

Given the updates to osrf_pycommon, here is a full suite of test jobs to see what happens with this in place:

Rolling:

Linux
Linux-aarch64
Windows
Windows Debug
RHEL-9

Humble:

Linux
Linux-aarch64
Windows
RHEL-8

marcoag · 2024-02-01T04:32:02Z

test_ci_windows:

test_ci_linux-rhel:

clalancette · 2024-02-01T13:12:06Z

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.

clalancette · 2024-02-01T13:20:43Z

And this is now deployed!

marcoag requested review from clalancette, cottsay and nuclearsandwich as code owners January 15, 2024 05:34

clalancette requested changes Jan 16, 2024

View reviewed changes

clalancette mentioned this pull request Jan 16, 2024

Add Noble as choice for Ubuntu distro #739

Closed

marcoag requested a review from clalancette January 18, 2024 15:46

clalancette reviewed Jan 18, 2024

View reviewed changes

clalancette force-pushed the marcoag/add_noble branch from 28bc334 to e3c4636 Compare January 18, 2024 16:23

clalancette approved these changes Jan 23, 2024

View reviewed changes

Marco A. Gutierrez and others added 3 commits January 24, 2024 10:17

Add noble as an Ubuntu distro of choice.

35c0496

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

keep jammy as default and as option for rolling

01a7c17

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

Remove UBUNTU_DISTRO checks.

420e1ef

It is enough to just have the ROS_DISTRO checks here. Signed-off-by: Chris Lalancette <clalancette@gmail.com>

clalancette force-pushed the marcoag/add_noble branch from e3c4636 to 420e1ef Compare January 24, 2024 15:17

Marco A. Gutierrez added 3 commits January 24, 2024 15:47

Skip ignition packages for noble.

7f60079

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

PIP break system packages.

f5d938d

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

Remove trailing backslash.

b1a438c

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

Marco A. Gutierrez added 2 commits January 31, 2024 03:22

Update core subtree to f65f859.

1c9b08e

git-subtree-dir: ros2_batch_job/vendor/osrf_pycommon git-subtree-split: f65f8594161dcff276813d59d3c1145ce767bb75 Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

Coroutine decorator is deprecated, using async.

05eaca8

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

marcoag force-pushed the marcoag/add_noble branch from cdf08a1 to b1a438c Compare January 31, 2024 03:27

Adding missing async.

f032cca

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

Merge branch 'master' into marcoag/add_noble

037408b

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>

clalancette approved these changes Feb 1, 2024

View reviewed changes

clalancette merged commit f062dc4 into master Feb 1, 2024
1 check passed

delete-merged-branch bot deleted the marcoag/add_noble branch February 1, 2024 13:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add noble as an Ubuntu distro of choice. #738

Add noble as an Ubuntu distro of choice. #738

marcoag commented Jan 15, 2024

clalancette Jan 16, 2024

marcoag Jan 18, 2024

clalancette Jan 16, 2024

marcoag Jan 18, 2024

clalancette Jan 18, 2024

clalancette commented Jan 18, 2024

clalancette left a comment

marcoag commented Jan 30, 2024 •

edited

Loading

marcoag commented Jan 31, 2024

clalancette commented Jan 31, 2024

clalancette commented Jan 31, 2024 •

edited

Loading

marcoag commented Feb 1, 2024

clalancette commented Feb 1, 2024

clalancette commented Feb 1, 2024

Add noble as an Ubuntu distro of choice. #738

Add noble as an Ubuntu distro of choice. #738

Conversation

marcoag commented Jan 15, 2024

clalancette Jan 16, 2024

Choose a reason for hiding this comment

marcoag Jan 18, 2024

Choose a reason for hiding this comment

clalancette Jan 16, 2024

Choose a reason for hiding this comment

marcoag Jan 18, 2024

Choose a reason for hiding this comment

clalancette Jan 18, 2024

Choose a reason for hiding this comment

clalancette commented Jan 18, 2024

clalancette left a comment

Choose a reason for hiding this comment

marcoag commented Jan 30, 2024 • edited Loading

marcoag commented Jan 31, 2024

clalancette commented Jan 31, 2024

clalancette commented Jan 31, 2024 • edited Loading

marcoag commented Feb 1, 2024

clalancette commented Feb 1, 2024

clalancette commented Feb 1, 2024

marcoag commented Jan 30, 2024 •

edited

Loading

clalancette commented Jan 31, 2024 •

edited

Loading