From c4fd416f2846dfc359b0f9f7a7e105a25f8ee7b2 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 4 Mar 2016 15:42:09 -0800 Subject: [PATCH 1/2] check if setup file exists before using it --- scripts/doc/build_doc.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/doc/build_doc.py b/scripts/doc/build_doc.py index cf691183f..015aec3cf 100755 --- a/scripts/doc/build_doc.py +++ b/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, From 8fa95d462ef46aa76ba1702b116861d4cb85c4ea Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 4 Mar 2016 16:07:30 -0800 Subject: [PATCH 2/2] use same os_codename to generate Dockerfile for doc job --- .../templates/doc/doc_create_task.Dockerfile.em | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em b/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em index 551be55e2..1ac0adecf 100644 --- a/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em +++ b/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