Jammy (#81)

* Continue on error

* Include per-distro environment flags

* fixup

* Goodbye python2

* Don't run rosdep init if it was already configured

* Allow to select which ros distros to build

* Fix warning

* Don't continue on error

---------

Co-authored-by: Paul Bovbel <[email protected]>

Author: garyservin

environment/Dockerfile

@@ -38,7 +38,7 @@ RUN git clone https://github.com/locusrobotics/deb-s3.git && \
     cd deb-s3 && bundle update --bundler && bundle install && ln -sf $(pwd)/bin/deb-s3 /usr/local/bin/deb-s3
 
 # Inject the rosdep definitions from source
-RUN rosdep init
+RUN if [[ ! -f /etc/ros/rosdep/sources.list.d/20-default.list ]] ; then rosdep init ; fi
 RUN echo "yaml file:///etc/ros/rosdep/rosdep.yaml" > /etc/ros/rosdep/sources.list.d/10-tailor.list
 COPY rosdistro/rosdep/rosdep.yaml /etc/ros/rosdep/rosdep.yaml
 

tailor_distro/create_recipes.py

@@ -23,6 +23,16 @@ def nested_update(d, u):
     return d
 
 
+def check_distro(recipe, os_version):
+    tmp = deepcopy(recipe)
+    for distro, config in recipe["distributions"].items():
+        os_list = config.get("os", [])
+        if len(os_list) != 0:
+            if os_version not in os_list:
+                del tmp["distributions"][distro]
+    return tmp
+
+
 def create_recipes(recipes: Mapping[str, Any], recipes_dir: pathlib.Path, release_track: str,
                    release_label: str, debian_version: str) -> None:
     """Create individual recipe defintions from a master recipes configuration.
@@ -41,6 +51,7 @@ def create_recipes(recipes: Mapping[str, Any], recipes_dir: pathlib.Path, releas
                 recipe_path.parent.mkdir(parents=True, exist_ok=True)
 
                 recipe = nested_update(recipes['common'], recipe_options)
+                recipe = check_distro(recipe, os_version)
 
                 recipe = dict(
                     **recipe,

tailor_distro/debian_templates/changelog.j2

@@ -2,4 +2,4 @@
 
   * TODO
 
- -- Paul Bovbel <pbovbel@locusrobotics.com> Mon, 1 Jan 2018 00:00:00 -0000
+ -- Paul Bovbel <pbovbel@locusrobotics.com>  Mon, 1 Jan 2018 00:00:00 -0000

tailor_distro/debian_templates/compat_catkin_tools/_setup_util.py.j2

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # Software License Agreement (BSD License)
@@ -55,7 +55,7 @@ ENV_VAR_SUBFOLDERS = {
     'LD_LIBRARY_PATH' if not IS_DARWIN else 'DYLD_LIBRARY_PATH': ['lib', os.path.join('lib', 'x86_64-linux-gnu')],
     'PATH': 'bin',
     'PKG_CONFIG_PATH': [os.path.join('lib', 'pkgconfig'), os.path.join('lib', 'x86_64-linux-gnu', 'pkgconfig')],
-    'PYTHONPATH': 'lib/python2.7/dist-packages',
+    'PYTHONPATH': 'lib/python3/dist-packages',
 }
 
 

tailor_distro/debian_templates/rules.j2

@@ -34,6 +34,9 @@ override_dh_auto_install:
 			source $(INSTALL_DIR)/{{ underlay_name }}/setup.bash && \
 		{% endif %}
 	{% endfor %}
+	{% for key, value in distro_options['env'].items() %}
+	export {{ key }}={{ value }} && \
+	{% endfor %}
 	export ROS_DISTRO_OVERRIDE={{ organization }}-{{ release_label }}-{{ flavour }} && \
 	env && \
 	TERM=dumb colcon build \