Add build test on indigo.

.travis.scripts/save_cache.sh

@@ -6,7 +6,7 @@ set -o verbose
 if [[ ${TRAVIS_BRANCH} == "master" ]] && [[ ${TRAVIS_PULL_REQUEST} == "false" ]];
 then
 	mkdir -p $(dirname ${DOCKER_CACHE_FILE})
-	docker save $(docker history -q ${PACKAGE_NAME}:latest | grep -v '<missing>') | lz4 -zcf - > ${DOCKER_CACHE_FILE}
+	docker save $(echo ${DOCKER_CACHE_TARGETS} | xargs -n1 docker history -q | grep -v '<missing>' | sort | uniq) | lz4 -zcf - > ${DOCKER_CACHE_FILE}
 
 	echo "------------"
 	ls -lh $(dirname ${DOCKER_CACHE_FILE})

.travis.scripts/test.sh

@@ -35,11 +35,11 @@ CMI_OPTION="--install-space /opt/ros/${ROS_DISTRO} --install"
 CMI_ONLY_PKG="--pkg ${PACKAGE_NAME}"
 
 catkin_make_isolated $CMI_OPTION || \
-  (gh-pr-comment FAILED '```catkin_make``` failed'; false)
+  (gh-pr-comment "FAILED on ${ROS_DISTRO}" '```catkin_make``` failed'; false)
 catkin_make_isolated $CMI_OPTION $CMI_ONLY_PKG --catkin-make-args tests || \
-  (gh-pr-comment FAILED '```catkin_make tests``` failed'; false)
+  (gh-pr-comment "FAILED on ${ROS_DISTRO}" '```catkin_make tests``` failed'; false)
 catkin_make_isolated $CMI_OPTION $CMI_ONLY_PKG --catkin-make-args run_tests || \
-  (gh-pr-comment FAILED '```catkin_make run_tests``` failed'; false)
+  (gh-pr-comment "FAILED on ${ROS_DISTRO}" '```catkin_make run_tests``` failed'; false)
 
 if [ catkin_test_results ];
 then
@@ -56,9 +56,9 @@ else
 `find build/test_results/ -name *.xml | xargs -n 1 -- bash -c 'echo; echo \#\#\# $0; echo; echo \\\`\\\`\\\`; xmllint --format $0; echo \\\`\\\`\\\`;'`
 "
 fi
-catkin_test_results || (gh-pr-comment FAILED "Test failed$result_text"; false)
+catkin_test_results || (gh-pr-comment "FAILED on ${ROS_DISTRO}" "Test failed$result_text"; false)
 
-gh-pr-comment PASSED "All tests passed$result_text"
+gh-pr-comment "PASSED on ${ROS_DISTRO}" "All tests passed$result_text"
 
 cd ..
 rm -rf /catkin_ws || true

.travis.yml

@@ -6,8 +6,9 @@ cache:
     - /home/travis/docker/
 env:
   global:
-    - DOCKER_CACHE_FILE=/home/travis/docker/cache.tar.lz4
     - PACKAGE_NAME=ypspur_ros
+    - DOCKER_CACHE_FILE=/home/travis/docker/cache.tar.lz4
+    - DOCKER_CACHE_TARGETS="${PACKAGE_NAME}:latest ${PACKAGE_NAME}:indigo"
 branches:
   only:
     - master
@@ -20,5 +21,6 @@ install: true
 
 script:
   - docker build -t ${PACKAGE_NAME}:latest --pull=true ${TRAVIS_BUILD_DIR} --build-arg TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST} --build-arg TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG} --build-arg TRAVIS_BOT_GITHUB_TOKEN=${TRAVIS_BOT_GITHUB_TOKEN} --build-arg PACKAGE_NAME=${PACKAGE_NAME}
+  - docker build -t ${PACKAGE_NAME}:indigo -f Dockerfile.indigo --pull=true ${TRAVIS_BUILD_DIR} --build-arg TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST} --build-arg TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG} --build-arg TRAVIS_BOT_GITHUB_TOKEN=${TRAVIS_BOT_GITHUB_TOKEN} --build-arg PACKAGE_NAME=${PACKAGE_NAME}
   - .travis.scripts/save_cache.sh
 

Dockerfile.indigo

@@ -0,0 +1,19 @@
+FROM ros:indigo
+
+RUN apt-get -qq update && \
+	apt-get install -y --no-install-recommends sudo wget curl build-essential && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
+
+ARG TRAVIS_PULL_REQUEST=false
+ARG TRAVIS_REPO_SLUG=""
+ARG TRAVIS_BOT_GITHUB_TOKEN=""
+ARG PACKAGE_NAME=""
+
+ENV TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST
+ENV TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG
+ENV TRAVIS_BOT_GITHUB_TOKEN=$TRAVIS_BOT_GITHUB_TOKEN
+ENV PACKAGE_NAME=$PACKAGE_NAME
+
+COPY ./ /catkin_ws/src/${PACKAGE_NAME}
+RUN /catkin_ws/src/${PACKAGE_NAME}/.travis.scripts/test.sh