Re-work distribution_type for global CI, fix config

ros-infrastructure · Jun 21, 2024 · b390cf5 · b390cf5
1 parent 82691f6
commit b390cf5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ros_buildfarm/ci_job.py b/ros_buildfarm/ci_job.py
@@ -247,9 +247,12 @@ def _get_ci_job_config(
             '%s=%s' % (var, value)
             for var, value in sorted(build_file.build_environment_variables.items())]
 
-    distribution_type = index.distributions.get(rosdistro_name, {}) \
-        .get('distribution_type', 'ros1')
-    assert distribution_type in (None, 'ros1', 'ros2')
+    if rosdistro_name:
+        distribution_type = index.distributions[rosdistro_name] \
+            .get('distribution_type', 'ros1')
+        assert distribution_type in ('ros1', 'ros2')
+    else:
+        distribution_type = 'global'
     ros_version = 1 if distribution_type == 'ros1' else 2
 
     for index in range(len(underlay_source_jobs)):

diff --git a/ros_buildfarm/config/__init__.py b/ros_buildfarm/config/__init__.py
@@ -79,7 +79,7 @@ def get_ci_build_files(index, dist_name):
 def get_global_ci_build_files(index):
     data = _load_build_file_data(index.ci_builds)
     build_files = {}
-    for k, v in data.items():
+    for k, (url, v) in data.items():
         build_files[k] = CIBuildFile(k, v)
     return build_files