Add code into the ci_build_file instead of the build_file

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
ros-infrastructure · Jun 16, 2024 · 7884b1a · 7884b1a
1 parent 895706c
commit 7884b1a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/ros_buildfarm/config/build_file.py b/ros_buildfarm/config/build_file.py
@@ -63,20 +63,15 @@ def __init__(self, name, data):  # noqa: D107
             assert isinstance(self.tag_blacklist, list)
 
         self.targets = {}
-        self.custom_rosdep_urls = []
         for os_name in data.get('targets', {}).keys():
             if os_name == '_config':
-                if 'custom_rosdep_urls' in data['targets']['_config']:
-                    self.custom_rosdep_urls = \
-                        data['targets']['_config']['custom_rosdep_urls']
-                    assert isinstance(self.custom_rosdep_urls, list)
-            else:
-                self.targets[os_name] = {}
-                for os_code_name in data['targets'][os_name].keys():
-                    self.targets[os_name][os_code_name] = {}
-                    for arch in data['targets'][os_name][os_code_name].keys():
-                        self.targets[os_name][os_code_name][arch] = \
-                            data['targets'][os_name][os_code_name][arch]
+                continue
+            self.targets[os_name] = {}
+            for os_code_name in data['targets'][os_name].keys():
+                self.targets[os_name][os_code_name] = {}
+                for arch in data['targets'][os_name][os_code_name].keys():
+                    self.targets[os_name][os_code_name][arch] = \
+                        data['targets'][os_name][os_code_name][arch]
 
         self.shared_ccache = False
         if 'shared_ccache' in data:

diff --git a/ros_buildfarm/config/ci_build_file.py b/ros_buildfarm/config/ci_build_file.py
@@ -152,3 +152,10 @@ def __init__(self, name, data):  # noqa: D107
         self.upload_directory = None
         if 'upload_directory' in data:
             self.upload_directory = data['upload_directory']
+
+        self.custom_rosdep_urls = []
+        if '_config' in data['targets']:
+            if 'custom_rosdep_urls' in data['targets']['_config']:
+                self.custom_rosdep_urls = \
+                    data['targets']['_config']['custom_rosdep_urls']
+                assert isinstance(self.custom_rosdep_urls, list)