Use install space by default (addresses ros-industrial#54).

Omit entire catkin build section when devel space is not choosed to be used.

Directory structure sorted out.
Add another pkg solely for testing only.

Conflicts:
	README.rst
	travis.sh

[.travis.yml] Allow failure for now the jade source build (see ros-industrial/industrial_core#144 (comment)).
[.travis.yml] Some more test matrix.

[Travis] Rename a file to avoid confusion.
Kinetic should better be no longer 'allow_failure'. warehouse_ros from shadow-fixed should pass.
[Travis] Remove less meaningful job (warehouse_ros prerelease). More Kinetic jobs.

.travis.yml

@@ -17,6 +17,10 @@ env:
   matrix:
     - ROS_DISTRO=indigo NOT_TEST_BUILD='true'
     - ROS_DISTRO=indigo NOT_TEST_INSTALL='true'
+    - ROS_DISTRO=indigo NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true'  # This may not make much sense. Only for testing purpose.
+    - ROS_DISTRO=indigo USE_DEVEL_SPACE='true'
+    - ROS_DISTRO=indigo USE_DEVEL_SPACE='true' NOT_TEST_BUILD='true'  # Expecting no testing to happen during build.
+    - ROS_DISTRO=indigo USE_DEVEL_SPACE='true' NOT_TEST_INSTALL='true'  # Expecting no testing to happen during install.
     - ROS_DISTRO=indigo CATKIN_PARALLEL_JOBS='-p1' ROS_PARALLEL_JOBS='-j1'  # Intend build on low-power platform
     # - env: ROS_DISTRO=indigo PRERELEASE=true  ## Comment out because this is meaningless for always failing without prerelease testable contents in industrial_ci.
     - ROS_DISTRO=indigo PRERELEASE=true PRERELEASE_REPONAME=industrial_core PRERELEASE_DOWNSTREAM_DEPTH=0
@@ -25,20 +29,21 @@ env:
     - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian
     - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file  # Using default file name for ROSINSTALL_FILENAME
     - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file USE_DEB=true  # Expected to fail. See https://github.com/ros-industrial/industrial_ci/pull/74
-    - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=https://raw.githubusercontent.com/ros-industrial/industrial_ci/master/.travis.rosinstall
+    - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=https://raw.githubusercontent.com/ros-industrial/industrial_ci/master/industrial_ci/.travis.rosinstall
     - ROS_DISTRO=indigo USE_DEB=true  # Checking backup compatibility with UPSTREAM_WORKSPACE
     - ROS_DISTRO=indigo USE_DEB=false # Checking backup compatibility with UPSTREAM_WORKSPACE
     - ROS_DISTRO=jade   APTKEY_STORE_SKS=hkp://ha.pool.sks-keyservers.vet  # Passing wrong SKS URL as a break test. Should still pass.
-    - ROS_DISTRO=jade   PRERELEASE=true PRERELEASE_REPONAME=warehouse_ros PRERELEASE_DOWNSTREAM_DEPTH=1
-    - ROS_DISTRO=jade   UPSTREAM_WORKSPACE=file  ROSINSTALL_FILENAME=.ci.rosinstall  # Testing arbitrary file name without ROS_DISTRO suffix. As of 6/3/2016 this fails due to https://github.com/ros-industrial/industrial_core/pull/144#issuecomment-223186764
+    - ROS_DISTRO=jade   UPSTREAM_WORKSPACE=file  ROSINSTALL_FILENAME=industrial_ci/.ci.rosinstall  # Testing arbitrary file name without ROS_DISTRO suffix. As of 6/3/2016 this fails due to https://github.com/ros-industrial/industrial_core/pull/144#issuecomment-223186764
+    - ROS_DISTRO=jade   PRERELEASE=true PRERELEASE_REPONAME=warehouse_ros PRERELEASE_DOWNSTREAM_DEPTH=1  # Intended to fail (as of Apr 2016), to test the capability of capturing Prerelease Test failure.
     - ROS_DISTRO=kinetic
+    - ROS_DISTRO=kinetic NOT_TEST_BUILD='true'
 matrix:
   allow_failures:
     - env: ROS_DISTRO=indigo PRERELEASE=true PRERELEASE_REPONAME=industrial_core PRERELEASE_DOWNSTREAM_DEPTH=0
     - env: ROS_DISTRO=indigo PRERELEASE=true PRERELEASE_REPONAME=ros_canopen
     - env: ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file USE_DEB=true  # Expected to fail. See https://github.com/ros-industrial/industrial_ci/pull/74
     - env: ROS_DISTRO=jade   PRERELEASE=true PRERELEASE_REPONAME=warehouse_ros PRERELEASE_DOWNSTREAM_DEPTH=1  # Intended to fail (as of Apr 2016), to test the capability of capturing Prerelease Test failure.
-    - env: ROS_DISTRO=kinetic
+    - env: ROS_DISTRO=jade   UPSTREAM_WORKSPACE=file  ROSINSTALL_FILENAME=.ci.rosinstall
 before_script:
   - CI_DIR=.ci_config
   - mkdir $CI_DIR; cp -R * $CI_DIR  # Need to copy, since directory starting from dot is ignoreed by catkin build. Also this folder name is used for testing both this repo itself and the "client" repositories
@@ -47,8 +52,8 @@ before_script:
   - if [ "${USE_CATKIN_MAKE}" == "true" ] ;then sed -i 's@catkin run_tests --no-deps --limit-status-rate 0.001@catkin_make run_tests@' $CI_DIR/travis.sh; fi
   - if [ "${USE_CATKIN_MAKE}" == "true" ] ;then export CATKIN_PARALLEL_JOBS="--no-color" ; fi
 script:
-  - source $CI_DIR/test/pre-process.sh
+  - source $CI_DIR/industrial_ci/test/pre-process.sh
   - source $CI_DIR/travis.sh
   - source $CI_DIR/test/test_inductrial_ci.sh
   - if [ "${AFTER_INSTALL}" != "" ] ; then sudo apt-get install -f ${AFTER_INSTALL}; fi
-  - source $CI_DIR/test/post-process.sh
+  - source $CI_DIR/industrial_ci/test/post-process.sh

README.rst

@@ -278,10 +278,12 @@ Then open a pull request using this branch against the branch that the change is
 Run pre-install custom commands
 -----------------------------------------
 
-You may want to add custom steps prior to the setup defined in `./travis.sh <./travis.sh>`_. Example:
+You may want to add custom steps prior to the setup defined in `./travis.sh <./travis.sh>`_. Example usecases:
 
 * A device driver package X in your repository or in your repository's dependency requires a prorietary library installed. This library is publicly available, but not via apt or any package management system and thus the only way you can install it is in a classic way (unzip, run installer etc.) (`More discussion <https://github.com/ros-industrial/industrial_ci/issues/14>`_).
 
+* You want to run `ros_lint` (`thi discussion <https://github.com/ros-industrial/industrial_ci/issues/58#issuecomment-223601916>`_ may be of your interest).
+
 In this case, add `source`d scripts before `travis.sh` gets called (see below for an example).
 
 ::