From f0fe446d02428963a98778ea3110568ade5cd7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Mon, 15 Jun 2020 17:02:49 +0200 Subject: [PATCH 1/2] Use the master branch from industrial_ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 420af2d..653498b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ env: global: - LIBGL_ALWAYS_SOFTWARE=1 - VERBOSE_OUTPUT='false' - - CATKIN_CONFIG='--no-install' - CATKIN_PARALLEL_JOBS='-p1' - ROS_PARALLEL_JOBS='-j1' - CCACHE_DIR=$HOME/.ccache @@ -18,14 +17,14 @@ env: - CATKIN_LINT_ARGS="--ignore link_directory" matrix: include: - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=lunar ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=lunar ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=melodic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=melodic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' + - env: PRERELEASE=true ROS_DISTRO=kinetic + - env: ROS_DISTRO=kinetic + - env: ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=.rexrov2.rosinstall + - env: PRERELEASE=true ROS_DISTRO=melodic + - env: ROS_DISTRO=melodic + - env: ROS_DISTRO=melodic UPSTREAM_WORKSPACE=.rexrov2.rosinstall install: - - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config + - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config -b master script: - source .ci_config/travis.sh notifications: From f4d9b9d52c26adb56025aece7dbfaf1b39ae1f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Mon, 15 Jun 2020 17:27:47 +0200 Subject: [PATCH 2/2] Add rosinstall file for tests with upstream repositories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .eca_a9.rosinstall | 3 +++ .travis.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .eca_a9.rosinstall diff --git a/.eca_a9.rosinstall b/.eca_a9.rosinstall new file mode 100644 index 0000000..69557eb --- /dev/null +++ b/.eca_a9.rosinstall @@ -0,0 +1,3 @@ +- git: + uri: https://github.com/uuvsimulator/uuv_simulator.git + local-name: uuv_simulator \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 653498b..79d4e61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,10 @@ matrix: include: - env: PRERELEASE=true ROS_DISTRO=kinetic - env: ROS_DISTRO=kinetic - - env: ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=.rexrov2.rosinstall + - env: ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=.eca_a9.rosinstall - env: PRERELEASE=true ROS_DISTRO=melodic - env: ROS_DISTRO=melodic - - env: ROS_DISTRO=melodic UPSTREAM_WORKSPACE=.rexrov2.rosinstall + - env: ROS_DISTRO=melodic UPSTREAM_WORKSPACE=.eca_a9.rosinstall install: - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config -b master script: