Merge branch 'master' into jrivero/split_windows_gpu

jenkins-scripts/docker/gz-abichecker.bash

@@ -24,7 +24,6 @@ fi
 GZ_NAME_PREFIX=$(\
   echo ${ABI_JOB_SOFTWARE_NAME} | tr '[:lower:]-' '[:upper:]_')
 ABI_JOB_PKG_DEPENDENCIES_VAR_NAME=${GZ_NAME_PREFIX}_DEPENDENCIES
-DART_FROM_PKGS_VAR_NAME=${GZ_NAME_PREFIX}_DART_FROM_PKGS
 
 # Identify GZ_MSGS_MAJOR_VERSION to help with dependency resolution
 export GZ_NAME_PREFIX_MAJOR_VERSION=$(\

jenkins-scripts/docker/lib/_gazebo_utils.sh

@@ -1,28 +1,3 @@
-GAZEBO_RUNTIME_TEST="""
-echo '# BEGIN SECTION: test the script'
-wget -P /tmp/ https://github.com/osrf/gazebo_models/archive/master.tar.gz
-mkdir -p ~/.gazebo/models
-tar -xvf /tmp/master.tar.gz -C ~/.gazebo/models --strip 1
-rm /tmp/master.tar.gz
-
-TEST_START=\`date +%s\`
-timeout --preserve-status 180 gazebo --verbose || true
-TEST_END=\`date +%s\`
-DIFF=\`echo \"\$TEST_END - \$TEST_START\" | bc\`
-
-if [ \$DIFF -lt 180 ]; then
-   echo 'The test took less than 180s. Something bad happened'
-   exit 1
-fi
-echo '# END SECTION'
-"""
-
-GAZEBO_MODEL_INSTALLATION="""
-wget -q https://github.com/osrf/gazebo_models/archive/master.tar.gz -O /tmp/master.tar.gz
-mkdir -p ~/.gazebo/models
-tar -xf /tmp/master.tar.gz -C ~/.gazebo/models --strip 1 >/dev/null 2>&1
-rm /tmp/master.tar.gz"""
-
 GZ_SIM_RUNTIME_TEST="""
 if \${GZ_SIM_RUNTIME_TEST_USE_IGN}; then
   CMD_TOOLS='ign'

jenkins-scripts/docker/lib/_ros_setup_buildsh.bash

@@ -10,7 +10,6 @@ if [ -z ${ROS_DISTRO} ]; then
   exit -1
 fi
 
-[[ -z ${USE_GZ_VERSION_ROSDEP} ]] && USE_GZ_VERSION_ROSDEP=false
 [[ -z ${USE_CATKIN_MAKE} ]] && USE_CATKIN_MAKE=false # use colcon by default
 [[ -z ${KEEP_WS_FILES} ]] && KEEP_WS_FILES=false # clean up install/ build/
 
@@ -35,12 +34,6 @@ export CATKIN_WS="${WORKSPACE}/ws"
 cat >> build.sh << DELIM_CONFIG
 set -ex
 
-if ${USE_GZ_VERSION_ROSDEP}; then
-  sudo apt-get install -y wget
-  sudo mkdir -p /etc/ros/rosdep/sources.list.d/
-  sudo wget https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gazebo${GAZEBO_VERSION_FOR_ROS}/00-gazebo${GAZEBO_VERSION_FOR_ROS}.list -O /etc/ros/rosdep/sources.list.d/00-gazebo${GAZEBO_VERSION_FOR_ROS}.list
-fi
-
 if [ `expr length "${ROS_SETUP_PREINSTALL_HOOK} "` -gt 1 ]; then
 echo '# BEGIN SECTION: running pre install hook'
 ${ROS_SETUP_PREINSTALL_HOOK}

jenkins-scripts/docker/lib/_ros_setup_catkin_make_isolated_buildsh.bash

@@ -10,19 +10,11 @@ if [ -z ${ROS_DISTRO} ]; then
   exit -1
 fi
 
-[[ -z ${USE_GZ_VERSION_ROSDEP} ]] && USE_GZ_VERSION_ROSDEP=false
-
 export CATKIN_WS="${WORKSPACE}/ws"
 
 cat >> build.sh << DELIM_CONFIG
 set -ex
 
-if ${USE_GZ_VERSION_ROSDEP}; then
-  sudo apt-get install -y wget
-  sudo mkdir -p /etc/ros/rosdep/sources.list.d/
-  sudo wget https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gazebo${GAZEBO_VERSION_FOR_ROS}/00-gazebo${GAZEBO_VERSION_FOR_ROS}.list -O /etc/ros/rosdep/sources.list.d/00-gazebo${GAZEBO_VERSION_FOR_ROS}.list
-fi
-
 if [ `expr length "${ROS_SETUP_PREINSTALL_HOOK} "` -gt 1 ]; then
 echo '# BEGIN SECTION: running pre install hook'
 ${ROS_SETUP_PREINSTALL_HOOK}