Fix issues with apt installer on 18.04 (#56)

* Add --apt-allow-insecure to apt installer
* This a workaround for security changes in apt. Using this flag will
allow 18.04 users to bundle for ROS kinetic and melodic.
* Add integration tests for ROS Melodic

Author: murphm8

.dockerignore

@@ -0,0 +1,6 @@
+integration/test_workspace/build
+integration/test_workspace/install
+integration/test_workspace/*_bundle
+integration/*/*.tar
+integration/*/*.tar.gz
+

.travis.yml

@@ -1,6 +1,12 @@
 language: python
 python: "3.5"
 dist: xenial
+env:
+  - TOXENV=unittest
+  - ROS_DISTRO=kinetic TOXENV=py35-pypi
+  - ROS_DISTRO=kinetic TOXENV=py35-github
+  - ROS_DISTRO=melodic TOXENV=py35-pypi
+  - ROS_DISTRO=melodic TOXENV=py35-github
 services:
   - docker
 sudo: true

Dockerfile Dockerfile.kinetic

@@ -8,7 +8,7 @@ COPY . /opt/package
 WORKDIR /opt/package
 
 RUN apt-get update && \
-	apt-get install -y python3-pip python3-apt python-pip
+	apt-get install -y python3-pip python3-apt python-pip enchant
 
 RUN	rosdep update && \
 	rosdep install --from-paths integration/test_workspace --ignore-src -r -y

Dockerfile.melodic

@@ -0,0 +1,25 @@
+FROM ros:melodic
+
+SHELL ["/bin/bash", "-c"]
+
+RUN echo "yaml https://s3-us-west-2.amazonaws.com/rosdep/base.yaml" > /etc/ros/rosdep/sources.list.d/19-aws-sdk.list
+
+COPY . /opt/package
+WORKDIR /opt/package
+
+RUN apt-get update && \
+	apt-get install -y python3-pip python3-apt python-pip enchant
+
+RUN	rosdep update && \
+	rosdep install --from-paths integration/test_workspace --ignore-src -r -y
+
+RUN pip3 install --upgrade pip setuptools
+RUN pip3 install -r requirements.txt
+RUN pip3 install -e .
+
+WORKDIR /opt/package/integration/test_workspace
+RUN source /opt/ros/melodic/setup.sh; colcon build
+RUN source /opt/ros/melodic/setup.sh; colcon bundle --bundle-version 1 --bundle-base v1 --apt-allow-insecure
+RUN source /opt/ros/melodic/setup.sh; colcon bundle --bundle-version 2 --bundle-base v2 --apt-allow-insecure
+
+

README.md

@@ -27,6 +27,14 @@ To build your ROS workspace into a bundle execute:
 This will parse your dependencies, download apt and pip dependencies, install the dependencies into the bundle, and
 then install your built workspace into the bundle. The final output is located at `bundle/output.tar`
 
+## Ubuntu 18.04
+
+**This version of Ubuntu is not yet officially supported**
+
+We are currently tracking an [issue](https://github.com/colcon/colcon-bundle/issues/3) to support 18.04. 
+In the mean time, if you would like to build on 18.04 you can use the `--apt-allow-insecure` flag in order to work 
+around the `apt` security issues we are running into.
+
 ## In Docker
 
 The simplest way to get up and running without affecting your local development environment is to use Docker.

colcon_bundle/installer/apt.py

@@ -20,6 +20,7 @@ def __init__(self):  # noqa: D107
         self._cache_dir = None
         self.context = None
         self.include_sources = False
+        self.allow_insecure = False
         self.sources_path = None
         self.metadata = {}
         satisfies_version(
@@ -50,6 +51,12 @@ def add_arguments(self, *, parser):  # noqa: D102
             '--apt-sources-list', default=sources_list_path,
             help='Path to the apt sources list that should be used for package'
                  'installation in the bundle.')
+        parser.add_argument(
+            '--apt-allow-insecure', action='store_true',
+            help='Sets Acquire::AllowInsecureRepositories and  '
+                 'Acquire::AllowDowngradeToInsecureRepositories to True. See '
+                 'apt-secure(8) manpage for more information.'
+        )
 
     def should_load(self):  # noqa: D102
         try:
@@ -80,6 +87,7 @@ def initialize(self, context):  # noqa: D102
         self._cache = apt.Cache(
             rootdir=self._cache_dir, progress=apt.progress.text.OpProgress())
         self.include_sources = self.context.args.include_sources
+        self.allow_insecure = self.context.args.apt_allow_insecure
         self.sources_path = os.path.join(self._cache_dir, 'sources')
         self.setup()
 
@@ -93,6 +101,16 @@ def setup(self):  # noqa: D102
         apt.apt_pkg.config.set('Dir::Etc::TrustedParts',
                                apt.apt_pkg.config.find_file(
                                    'Dir::Etc::TrustedParts'))
+        apt.apt_pkg.config.set('Acquire::BrokenProxy', 'true')
+        apt.apt_pkg.config.set('Acquire::http::Pipeline-Depth', '0')
+        apt.apt_pkg.config.set('Acquire::http::No-Cache', 'true')
+
+        if self.allow_insecure:
+            apt.apt_pkg.config.set(
+                'Acquire::AllowInsecureRepositories', 'True')
+            apt.apt_pkg.config.set(
+                'Acquire::AllowDowngradeToInsecureRepositories', 'True')
+
         apt.apt_pkg.config.clear('APT::Update::Post-Invoke-Success')
 
         sources_list_file = os.path.join(self._cache_dir, 'etc', 'apt',

run_integration_test.sh

@@ -11,7 +11,7 @@ rm -rf integration/v2.tar
 # Preparing dependencies generated by tox to requirements.txt for docker use
 pip freeze > requirements.txt
 # Build bundles
-docker build -t test-container .
+docker build -f Dockerfile.${ROS_DISTRO} -t test-container .
 # Copy bundles into local directory
 docker run -v=$(pwd):/workspace test-container /workspace/integration/copy-bundles.sh
 
@@ -33,5 +33,12 @@ mkdir ./v1_bundle
 tar -xzOf ./v1.tar.gz bundle.tar | tar -xf - --directory ./v1_bundle
 
 # Run tests
-docker run -it -v $(pwd):/workspace ubuntu:xenial /workspace/test_v1.sh
-docker run -it -v $(pwd):/workspace ubuntu:xenial /workspace/test_v2.sh
+if [[ $act = "kinetic" ]]
+then
+	docker run -it -v $(pwd):/workspace ubuntu:xenial /workspace/test_v1.sh
+	docker run -it -v $(pwd):/workspace ubuntu:xenial /workspace/test_v2.sh
+else
+	docker run -it -v $(pwd):/workspace ubuntu:bionic /workspace/test_v1.sh
+	docker run -it -v $(pwd):/workspace ubuntu:bionic /workspace/test_v2.sh
+fi
+

tox.ini

@@ -1,18 +1,16 @@
-[tox]
-envlist = unittest,py35-{pypi, github}
-
-
 [testenv:unittest]
 deps = -rrequirements_devel.txt
 commands = {envpython} -m pytest --cov=colcon_ros --cov-branch
 
 [testenv:py35-pypi]
+passenv = *
 deps =
     colcon-core
     colcon-ros-bundle
 commands = ./run_integration_test.sh
 
 [testenv:py35-github]
+passenv = *
 deps =
     -e git+https://github.com/colcon/colcon-cmake.git#egg=colcon-cmake
     -e git+https://github.com/colcon/colcon-core.git#egg=colcon-core