Merge pull request #228 from ros-infrastructure/fix_catkin_doc_job

fix catkin doc job

Author: dirk-thomas

ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em

@@ -1,6 +1,6 @@
 # generated from @template_name
 
-FROM ubuntu:trusty
+FROM ubuntu:@os_code_name
 MAINTAINER Dirk Thomas dthomas+buildfarm@@osrfoundation.org
 
 VOLUME ["/var/cache/apt/archives"]
@@ -16,7 +16,7 @@ RUN useradd -u @uid -m buildfarm
     'snippet/add_distribution_repositories.Dockerfile.em',
     distribution_repository_keys=distribution_repository_keys,
     distribution_repository_urls=distribution_repository_urls,
-    os_code_name='trusty',
+    os_code_name=os_code_name,
     add_source=False,
 ))@
 
@@ -28,6 +28,12 @@ RUN useradd -u @uid -m buildfarm
 # automatic invalidation once every day
 RUN echo "@today_str"
 
+@(TEMPLATE(
+    'snippet/install_python3.Dockerfile.em',
+    os_name=os_name,
+    os_code_name=os_code_name,
+))@
+
 RUN python3 -u /tmp/wrapper_scripts/apt-get.py update-and-install -q -y git mercurial python3-apt python3-catkin-pkg python3-empy python3-rosdep python3-rosdistro subversion
 
 # always invalidate to actually have the latest apt and rosdep state

scripts/doc/build_doc.py

@@ -86,13 +86,14 @@ def main(argv=sys.argv[1:]):
                 args.output_dir, 'symbols', '%s.tag' % pkg_name)
 
             source_cmd = [
-                # for workspaces with only plain cmake packages the setup files
-                # generated by cmi won't implicitly source the underlays
-                '.', '/opt/ros/%s/setup.sh' % args.rosdistro_name,
-                '&&',
                 '.', os.path.join(
                     args.workspace_root, 'install_isolated', 'setup.sh'),
             ]
+            # for workspaces with only plain cmake packages the setup files
+            # generated by cmi won't implicitly source the underlays
+            setup_file = '/opt/ros/%s/setup.sh' % args.rosdistro_name
+            if os.path.exists(setup_file):
+                source_cmd = ['.', setup_file] + source_cmd
             rosdoc_lite_cmd = [
                 os.path.join(args.rosdoc_lite_dir, 'scripts', 'rosdoc_lite'),
                 pkg_path,