add rosdep_update_options

ros_buildfarm/argument.py

@@ -184,6 +184,14 @@ def add_argument_target_repository(parser):
         help='The target repository where generated packages are pushed to')
 
 
+def add_argument_custom_rosdep_update_options(parser):
+    parser.add_argument(
+        '--custom-rosdep-update-options',
+        nargs='*',
+        default=[],
+        help='A list of custom rosdep update options')
+
+
 def add_argument_custom_rosdep_urls(parser):
     parser.add_argument(
         '--custom-rosdep-urls',

ros_buildfarm/templates/devel/devel_create_tasks.Dockerfile.em

@@ -59,7 +59,7 @@ USER buildfarm
 ENTRYPOINT ["sh", "-c"]
 @{
 cmds = [
-'rosdep update',
+    ' '.join(['rosdep', 'update'] + rosdep_update_options),
 ]
 workspace_root = '/tmp/ws'
 if prerelease_overlay:

ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em

@@ -54,7 +54,7 @@ USER buildfarm
 ENTRYPOINT ["sh", "-c"]
 @{
 cmds = [
-    'rosdep update',
+    ' '.join(['rosdep', 'update'] + rosdep_update_options),
 
     'PYTHONPATH=/tmp/ros_buildfarm:$PYTHONPATH python3 -u' + \
     ' /tmp/ros_buildfarm/scripts/doc/create_doc_task_generator.py' + \

scripts/devel/run_devel_job.py

@@ -21,6 +21,7 @@
 from ros_buildfarm.argument import add_argument_arch
 from ros_buildfarm.argument import add_argument_build_name
 from ros_buildfarm.argument import add_argument_build_tool
+from ros_buildfarm.argument import add_argument_custom_rosdep_update_options
 from ros_buildfarm.argument import add_argument_custom_rosdep_urls
 from ros_buildfarm.argument import \
     add_argument_distribution_repository_key_files
@@ -56,6 +57,7 @@ def main(argv=sys.argv[1:]):
         action='store_true',
         help='Operate on two catkin workspaces')
     add_argument_build_tool(parser, required=True)
+    add_argument_custom_rosdep_update_options(parser)
     add_argument_ros_version(parser)
     add_argument_env_vars(parser)
     add_argument_dockerfile_dir(parser)
@@ -68,6 +70,7 @@ def main(argv=sys.argv[1:]):
             args.distribution_repository_urls,
             args.distribution_repository_key_files),
         'custom_rosdep_urls': args.custom_rosdep_urls,
+        'rosdep_update_options': args.custom_rosdep_update_options,
         'uid': get_user_id(),
     })
     create_dockerfile(

scripts/doc/run_doc_job.py

@@ -22,6 +22,7 @@
 from ros_buildfarm.argument import add_argument_build_name
 from ros_buildfarm.argument import add_argument_build_tool
 from ros_buildfarm.argument import add_argument_config_url
+from ros_buildfarm.argument import add_argument_custom_rosdep_update_options
 from ros_buildfarm.argument import add_argument_custom_rosdep_urls
 from ros_buildfarm.argument import \
     add_argument_distribution_repository_key_files
@@ -55,6 +56,7 @@ def main(argv=sys.argv[1:]):
     add_argument_distribution_repository_urls(parser)
     add_argument_distribution_repository_key_files(parser)
     add_argument_custom_rosdep_urls(parser)
+    add_argument_custom_rosdep_update_options(parser)
     add_argument_force(parser)
     add_argument_dockerfile_dir(parser)
     args = parser.parse_args(argv)
@@ -66,6 +68,7 @@ def main(argv=sys.argv[1:]):
             args.distribution_repository_urls,
             args.distribution_repository_key_files),
         'custom_rosdep_urls': args.custom_rosdep_urls,
+        'rosdep_update_options': args.custom_rosdep_update_options,
         'uid': get_user_id(),
     })
     create_dockerfile(

scripts/prerelease/generate_prerelease_script.py

@@ -28,6 +28,7 @@
 from ros_buildfarm.argument import add_argument_build_name
 from ros_buildfarm.argument import add_argument_build_tool
 from ros_buildfarm.argument import add_argument_config_url
+from ros_buildfarm.argument import add_argument_custom_rosdep_update_options
 from ros_buildfarm.argument import add_argument_os_code_name
 from ros_buildfarm.argument import add_argument_os_name
 from ros_buildfarm.argument import add_argument_output_dir
@@ -53,6 +54,7 @@ def main(argv=sys.argv[1:]):
     add_argument_os_code_name(parser)
     add_argument_arch(parser)
     add_argument_build_tool(parser)
+    add_argument_custom_rosdep_update_options(parser)
     add_argument_output_dir(parser, required=True)
 
     group = parser.add_argument_group(
@@ -275,6 +277,7 @@ def beforeInclude(self, *_, **kwargs):
         'scms': scms,
         'scripts': hook.scripts,
         'overlay_scripts': overlay_scripts,
+        'rosdep_update_options': args.custom_rosdep_update_options,
         'ros_buildfarm_python_path': os.path.dirname(
             os.path.dirname(os.path.abspath(ros_buildfarm_file))),
         'python_executable': sys.executable,