diff --git a/jenkins-scripts/docker/gazebo-abichecker.bash b/jenkins-scripts/docker/gazebo-abichecker.bash
deleted file mode 100644
index 309ca3a31..000000000
--- a/jenkins-scripts/docker/gazebo-abichecker.bash
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -x
-
-# Knowing Script dir beware of symlink
-[[ -L ${0} ]] && SCRIPT_DIR=$(readlink ${0}) || SCRIPT_DIR=${0}
-SCRIPT_DIR="${SCRIPT_DIR%/*}"
-
-if [[ -z ${ARCH} ]]; then
- echo "ARCH variable not set!"
- exit 1
-fi
-
-if [[ -z ${DISTRO} ]]; then
- echo "DISTRO variable not set!"
- exit 1
-fi
-
-. ${SCRIPT_DIR}/lib/_gazebo_version_hook.bash
-
-export ABI_JOB_SOFTWARE_NAME="gazebo-classic"
-export ABI_JOB_HEADER_PREFIX="gazebo-*"
-export ABI_JOB_REPOS="stable"
-export ABI_JOB_PKG_DEPENDENCIES_VAR_NAME="GAZEBO_BASE_DEPENDENCIES"
-export ABI_JOB_IGNORE_HEADERS="gazebo/GIMPACT gazebo/opcode gazebo/test"
-
-. ${SCRIPT_DIR}/lib/generic-abi-base.bash
diff --git a/jenkins-scripts/docker/gazebo-compilation.bash b/jenkins-scripts/docker/gazebo-compilation.bash
deleted file mode 100644
index 6a8024d38..000000000
--- a/jenkins-scripts/docker/gazebo-compilation.bash
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -x
-
-# Knowing Script dir beware of symlink
-[[ -L ${0} ]] && SCRIPT_DIR=$(readlink ${0}) || SCRIPT_DIR=${0}
-SCRIPT_DIR="${SCRIPT_DIR%/*}"
-
-if [[ -z ${ARCH} ]]; then
- echo "ARCH variable not set!"
- exit 1
-fi
-
-if [[ -z ${DISTRO} ]]; then
- echo "DISTRO variable not set!"
- exit 1
-fi
-
-export DART_FROM_PKGS=true
-
-OSRF_REPOS_TO_USE="stable"
-
-. ${SCRIPT_DIR}/lib/_gazebo_version_hook.bash
-
-if [[ $GAZEBO_MAJOR_VERSION -ge 11 ]]; then
- NEED_C17_COMPILER=true
-fi
-
-export GZDEV_PROJECT_NAME="gazebo${GAZEBO_MAJOR_VERSION}"
-
-# Can not use generic compilation since we host the DART instalation and some
-# other logic based of every gazebo version
-. ${SCRIPT_DIR}/lib/gazebo-base-default.bash
diff --git a/jenkins-scripts/docker/gazebo-install-test-job.bash b/jenkins-scripts/docker/gazebo-install-test-job.bash
deleted file mode 100644
index 366d4bd38..000000000
--- a/jenkins-scripts/docker/gazebo-install-test-job.bash
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash -x
-
-# Knowing Script dir beware of symlink
-[[ -L ${0} ]] && SCRIPT_DIR=$(readlink ${0}) || SCRIPT_DIR=${0}
-SCRIPT_DIR="${SCRIPT_DIR%/*}"
-
-export GPU_SUPPORT_NEEDED=true
-
-# Import library
-. ${SCRIPT_DIR}/lib/_gazebo_utils.sh
-
-INSTALL_JOB_POSTINSTALL_HOOK="""
-${GAZEBO_RUNTIME_TEST}
-"""
-# Need bc to proper testing and parsing the time
-export DEPENDENCY_PKGS="${DEPENDENCY_PKGS} wget bc"
-
-. ${SCRIPT_DIR}/lib/generic-install-base.bash
diff --git a/jenkins-scripts/docker/gazebo-one-line-install-test-job.bash b/jenkins-scripts/docker/gazebo-one-line-install-test-job.bash
deleted file mode 100644
index af573a9d4..000000000
--- a/jenkins-scripts/docker/gazebo-one-line-install-test-job.bash
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-# Knowing Script dir beware of symlink
-[[ -L ${0} ]] && SCRIPT_DIR=$(readlink ${0}) || SCRIPT_DIR=${0}
-SCRIPT_DIR="${SCRIPT_DIR%/*}"
-
-export GPU_SUPPORT_NEEDED=true
-
-# Both empty, the one line script should handle all the stuff
-export INSTALL_JOB_PKG=""
-export INSTALL_JOB_REPOS=""
-
-. ${SCRIPT_DIR}/lib/_gazebo_utils.bash
-
-INSTALL_JOB_POSTINSTALL_HOOK="""
-echo '# BEGIN SECTION: run the one-liner installation'
-curl -ssL http://get.gazebosim.org | sh
-echo '# END SECTION'
-
-${GAZEBO_RUNTIME_TEST}
-"""
-
-# Need bc to proper testing and parsing the time
-export DEPENDENCY_PKGS DEPENDENCY_PKGS="bc"
-
-. ${SCRIPT_DIR}/lib/generic-install-base.bash
diff --git a/jenkins-scripts/docker/gz-abichecker.bash b/jenkins-scripts/docker/gz-abichecker.bash
index b44a46eee..62cc0e9e9 100644
--- a/jenkins-scripts/docker/gz-abichecker.bash
+++ b/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=$(\
diff --git a/jenkins-scripts/docker/lib/_gazebo_utils.sh b/jenkins-scripts/docker/lib/_gazebo_utils.sh
index c1cea83f8..1bebfe75a 100644
--- a/jenkins-scripts/docker/lib/_gazebo_utils.sh
+++ b/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'
diff --git a/jenkins-scripts/docker/lib/_gazebo_version_hook.bash b/jenkins-scripts/docker/lib/_gazebo_version_hook.bash
deleted file mode 100644
index df2a6bf74..000000000
--- a/jenkins-scripts/docker/lib/_gazebo_version_hook.bash
+++ /dev/null
@@ -1,10 +0,0 @@
-# Identify GAZEBO_MAJOR_VERSION to help with dependency resolution
-GAZEBO_MAJOR_VERSION=$(\
- python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \
- ${WORKSPACE}/gazebo-classic/CMakeLists.txt)
-
-# Check gazebo version is integer
-if ! [[ ${GAZEBO_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
- echo "Error! GAZEBO_MAJOR_VERSION is not an integer, check the detection"
- exit -1
-fi
diff --git a/jenkins-scripts/docker/lib/_ros_setup_buildsh.bash b/jenkins-scripts/docker/lib/_ros_setup_buildsh.bash
index 525fbff5e..93647351a 100644
--- a/jenkins-scripts/docker/lib/_ros_setup_buildsh.bash
+++ b/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}
diff --git a/jenkins-scripts/docker/lib/_ros_setup_catkin_make_isolated_buildsh.bash b/jenkins-scripts/docker/lib/_ros_setup_catkin_make_isolated_buildsh.bash
index 650886b24..71bf86a01 100644
--- a/jenkins-scripts/docker/lib/_ros_setup_catkin_make_isolated_buildsh.bash
+++ b/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}
diff --git a/jenkins-scripts/docker/lib/gazebo-base-default.bash b/jenkins-scripts/docker/lib/gazebo-base-default.bash
deleted file mode 100644
index b77fbbd8b..000000000
--- a/jenkins-scripts/docker/lib/gazebo-base-default.bash
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/bin/bash -x
-
-# Parameters
-# - GAZEBO_BASE_CMAKE_ARGS (optional) extra arguments to pass to cmake
-# - GAZEBO_BASE_TESTS_HOOK (optional) [default to run UNIT, INTEGRATION, REGRESSION, EXAMPLE]
-# piece of code to run in the testing section
-# - GAZEBO_BUILD_$DEP (optional) [default false]
-# build dependencies from source.
-# DEP = SDFORMAT | GZ_MATH | GZ_TRANSPORT | GZ_GUI | GZ_COMMON
-# branch parameter = $DEP_BRANCH
-
-#stop on error
-set -e
-
-GAZEBO_OSRF_DEPS="SDFORMAT GZ_MATH GZ_TRANSPORT GZ_GUI GZ_COMMON"
-
-. ${SCRIPT_DIR}/lib/_gazebo_version_hook.bash
-
-echo '# BEGIN SECTION: setup the testing enviroment'
-# Define the name to be used in docker
-DOCKER_JOB_NAME="gazebo_ci"
-. ${SCRIPT_DIR}/lib/boilerplate_prepare.sh
-
-[ -z ${COVERAGE_ENABLED} ] && COVERAGE_ENABLED=false
-
-# If Coverage build type was supplied in GAZEBO_BASE_CMAKE_ARGS, add lcov
-# package.
-if [[ ${GAZEBO_BASE_CMAKE_ARGS} != ${GAZEBO_BASE_CMAKE_ARGS/Coverage} ]]; then
- EXTRA_PACKAGES="${EXTRA_PACKAGES} lcov"
-fi
-
-if ${COVERAGE_ENABLED} ; then
- # Workaround on problem with setting HOME to /var/lib/jenkins
- if [[ -f $HOME/bullseye-jenkins-license ]]; then
- LICENSE_FILE="$HOME/bullseye-jenkins-license"
- else
- LICENSE_FILE="/var/lib/jenkins/bullseye-jenkins-license"
- fi
-
- set +x # keep password secret
- BULLSEYE_LICENSE=`cat $LICENSE_FILE`
- set -x # back to debug
-
- EXTRA_PACKAGES="${EXTRA_PACKAGES} wget"
-fi
-
-SOFTWARE_DIR="gazebo-classic"
-
-cat > build.sh << DELIM_DART
-###################################################
-# Make project-specific changes here
-#
-set -ex
-source ${TIMING_DIR}/_time_lib.sh ${WORKSPACE}
-
-if ${COVERAGE_ENABLED} ; then
- echo '# BEGIN SECTION: setup bulleyes coverage'
- # Clean previous content
- rm -fr $WORKSPACE/coverage
- # Download and install Bullseyes
- cd $WORKSPACE
- rm -fr $WORKSPACE/Bulls*
-
- # Look for current version. NOT IN USE since we lost the maintenance support on 2014
- # reenable if the support is back.
- # wget http://www.bullseye.com/download/ -O bull_index.html
- # BULL_TAR=\$( grep -R BullseyeCoverage-.*-Linux-x64.tar bull_index.html | head -n 1 | sed 's/.*">//' | sed 's/<.*//' )
- # wget http://www.bullseye.com/download/\$BULL_TAR -O bullseye.tar
-
- # Download package
- wget https://www.dropbox.com/s/i1ay7t8sg8i77jr/bullseye-8.8.9.tar -O bullseye.tar
- tar -xf bullseye.tar
- cd Bulls*
- # Set up the license
- echo $PATH >install-path
- rm -fr /usr/bullseyes
- set +x # keep password secret
- ./install --prefix /usr/bullseyes --key $BULLSEYE_LICENSE
- set -x # back to debug
- # Set up Bullseyes for compiling
- export PATH=/usr/bullseyes/bin:\$PATH
- export COVFILE=$WORKSPACE/${SOFTWARE_DIR}/test.cov
- cd $WORKSPACE/${SOFTWARE_DIR}
- covselect --file test.cov --add .
- cov01 --on
- echo '# END SECTION'
-fi
-
-# Step 2: configure and build
-# Check for DART
-if $DART_COMPILE_FROM_SOURCE; then
- echo '# BEGIN SECTION: compiling DART from source'
- if [ -d $WORKSPACE/dart ]; then
- cd $WORKSPACE/dart
- git pull
- else
- git clone https://github.com/dartsim/dart.git $WORKSPACE/dart
- fi
- rm -fr $WORKSPACE/dart/build
- mkdir -p $WORKSPACE/dart/build
- cd $WORKSPACE/dart/build
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr
- #make -j${MAKE_JOBS}
- make -j1
- sudo make install
- echo '# END SECTION'
-fi
-DELIM_DART
-
-# Process the source build of dependencies if needed
-for dep_uppercase in $GAZEBO_OSRF_DEPS; do
- dep=`echo $dep_uppercase | tr '[:upper:]' '[:lower:]'`
- EXTRA_PACKAGES="${EXTRA_PACKAGES} git"
- eval dependecy_installation="\$GAZEBO_BUILD_$dep_uppercase"
-
- if [[ -n ${dependecy_installation} ]] && ${dependecy_installation}; then
- # Handle the depedency BRANCH
- eval dep_branch=\$$dep_uppercase\_BRANCH
- [[ -z ${dep_branch} ]] && dep_branch='master'
-cat >> build.sh << DELIM_BUILD_DEPS
- echo "# BEGIN SECTION: building dependency: ${dep} (${dep_branch})"
- echo '# END SECTION'
- rm -fr $WORKSPACE/$dep
-
- if [[ ${dep/ign} == ${dep} ]]; then
- dependency_repo="osrf/${dep}"
- else
- # need to replace _ by -
- dependency_repo="gazebosim/${dep/_/-}"
- fi
-
- git clone http://github.com/\$dependency_repo -b ${dep_branch} \
- $WORKSPACE/$dep
-
- GENERIC_ENABLE_TIMING=false
- GENERIC_ENABLE_CPPCHECK=false
- GENERIC_ENABLE_TESTS=false
- SOFTWARE_DIR=$dep
- cd $WORKSPACE
- . ${SCRIPT_DIR}/lib/_generic_linux_compilation.bash ${SCRIPT_DIR}
- cd $WORKSPACE && rm -fr $WORKSPACE/build
-DELIM_BUILD_DEPS
- fi
-done
-
-cat >> build.sh << DELIM
-# Normal cmake routine for Gazebo
-echo '# BEGIN SECTION: Gazebo configuration'
-rm -rf $WORKSPACE/install
-mkdir -p $WORKSPACE/install $WORKSPACE/build
-cd $WORKSPACE/build
-cmake ${GAZEBO_BASE_CMAKE_ARGS} \\
- -DCMAKE_INSTALL_PREFIX=/usr \\
- -DENABLE_SCREEN_TESTS:BOOL=False \\
- $WORKSPACE/${SOFTWARE_DIR}
-echo '# END SECTION'
-
-echo '# BEGIN SECTION: Gazebo compilation'
-init_stopwatch COMPILATION
-make -j${MAKE_JOBS}
-stop_stopwatch COMPILATION
-echo '# END SECTION'
-
-echo '# BEGIN SECTION: Tests compilation'
-init_stopwatch TESTS_COMPILATION
-make -j${MAKE_JOBS} tests
-stop_stopwatch TESTS_COMPILATION
-echo '# END SECTION'
-
-echo '# BEGIN SECTION: Gazebo installation'
-sudo make install
-echo '# END SECTION'
-
-# Need to clean up from previous built
-rm -fr $WORKSPACE/cppcheck_results
-rm -fr $WORKSPACE/test_results
-
-# Run tests
-if [ `expr length "${GAZEBO_BASE_TESTS_HOOK} "` -gt 1 ]; then
- ${GAZEBO_BASE_TESTS_HOOK}
- : # keep this line, needed if the variable is empty
-else
- # Run default
- RERUN_FAILED_TESTS=1
- init_stopwatch TEST
- echo '# BEGIN SECTION: UNIT testing'
- make test ARGS="-VV -R UNIT_*" || true
- echo '# END SECTION'
- echo '# BEGIN SECTION: INTEGRATION testing'
- . ${WORKSPACE}/scripts/jenkins-scripts/lib/make_test_rerun_failed.bash "-VV -R INTEGRATION_*"
- echo '# END SECTION'
- echo '# BEGIN SECTION: REGRESSION testing'
- . ${WORKSPACE}/scripts/jenkins-scripts/lib/make_test_rerun_failed.bash "-VV -R REGRESSION_*"
- echo '# END SECTION'
- echo '# BEGIN SECTION: EXAMPLE testing'
- make test ARGS="-VV -R EXAMPLE_*" || true
- stop_stopwatch TEST
- echo '# END SECTION'
-fi
-
-if ${COVERAGE_ENABLED} ; then
- echo '# BEGIN SECTION: UNIT testing'
- rm -fr $WORKSPACE/coverage
- rm -fr $WORKSPACE/bullshtml
- mkdir -p $WORKSPACE/coverage
- covselect --add '!$WORKSPACE/build/' '!../build/' '!test/' '!tools/test/' '!deps/' '!/opt/' '!gazebo/rendering/skyx/' '!/tmp/'
- covhtml --srcdir $WORKSPACE/${SOFTWARE_DIR}/ $WORKSPACE/coverage
- # Generate valid cover.xml file using the bullshtml software
- # java is needed to run bullshtml
- apt-get install -y default-jre
- cd $WORKSPACE
- wget http://bullshtml.googlecode.com/files/bullshtml_1.0.5.tar.gz -O bullshtml.tar.gz
- tar -xzf bullshtml.tar.gz
- cd bullshtml
- sh bullshtml .
- # Hack to remove long paths from report
- find . -name '*.html' -exec sed -i -e 's:${WORKSPACE}::g' {} \;
-fi
-
-echo '# BEGIN SECTION: running cppcheck'
-init_stopwatch CPPCHECK
-# Step 3: code check
-cd $WORKSPACE/${SOFTWARE_DIR}
-sh tools/code_check.sh -xmldir $WORKSPACE/build/cppcheck_results || true
-stop_stopwatch CPPCHECK
-echo '# END SECTION'
-DELIM
-
-USE_OSRF_REPO=true
-DEPENDENCY_PKGS="${BASE_DEPENDENCIES} \
- ${GAZEBO_BASE_DEPENDENCIES} \
- ${GAZEBO_EXTRA_DEPENDENCIES} \
- ${EXTRA_PACKAGES}"
-
-[[ -z ${GAZEBO_BUILD_GZ_MATH} ]] && GAZEBO_BUILD_GZ_MATH=false
-if $GAZEBO_BUILD_GZ_MATH; then
- DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MATH_DEPENDENCIES}"
-fi
-
-[[ -z ${GAZEBO_BUILD_GZ_MSGS} ]] && GAZEBO_BUILD_GZ_MSGS=false
-if $GAZEBO_BUILD_GZ_MSGS; then
- DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MSGS_DEPENDENCIES}"
-fi
-
-[[ -z ${GAZEBO_BUILD_GZ_TRANSPORT} ]] && GAZEBO_BUILD_GZ_TRANSPORT=false
-if $GAZEBO_BUILD_GZ_TRANSPORT; then
- DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_TRANSPORT_DEPENDENCIES}"
-fi
-
-[[ -z ${GAZEBO_BUILD_GZ_GUI} ]] && GAZEBO_BUILD_GZ_GUI=false
-if $GAZEBO_BUILD_GZ_GUI; then
- DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_GUI_DEPENDENCIES}"
-fi
-
-[[ -z ${GAZEBO_BUILD_GZ_COMMON} ]] && GAZEBO_BUILD_GZ_COMMON=false
-if $GAZEBO_BUILD_GZ_COMMON; then
- DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_COMMON_DEPENDENCIES}"
-fi
-
-[[ -z ${GAZEBO_BUILD_SDFORMAT} ]] && GAZEBO_BUILD_SDFORMAT=false
-if $GAZEBO_BUILD_SDFORMAT; then
- DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${SDFORMAT_BASE_DEPENDENCIES}"
-fi
-
-# Need for cmake DISPLAY check (it uses xwininfo command)
-if [[ $USE_GPU_DOCKER ]]; then
- DEPENDENCY_PKGS="${DEPENDENCY_PKGS} x11-utils"
-fi
-
-. ${SCRIPT_DIR}/lib/docker_generate_dockerfile.bash
-. ${SCRIPT_DIR}/lib/docker_run.bash
diff --git a/jenkins-scripts/docker/lib/gazebo_ros_pkgs-base.bash b/jenkins-scripts/docker/lib/gazebo_ros_pkgs-base.bash
deleted file mode 100644
index bdaab8bdb..000000000
--- a/jenkins-scripts/docker/lib/gazebo_ros_pkgs-base.bash
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash -x
-
-# Use always GPU in drcsim project
-export GPU_SUPPORT_NEEDED=true
-
-DOCKER_JOB_NAME="gazebo_ros_pkgs_ci"
-. ${SCRIPT_DIR}/lib/boilerplate_prepare.sh
-. ${SCRIPT_DIR}/lib/_gazebo_utils.sh
-
-# Generate the first part of the build.sh file for ROS
-ROS_WS_PREBUILD_HOOK="""
-${ROS_WS_PREBUILD_HOOK}
-cd ${CATKIN_WS}
-cat >> colcon.meta << DELIM_PREBUILD_HOOK
-{
- "names": {
- "gazebo_plugins": {
- "catkin-cmake-args": ["-DENABLE_DISPLAY_TESTS:BOOL=ON"]
- }
- }
-}
-DELIM_PREBUILD_HOOK
-"""
-
-ROS_SETUP_PREINSTALL_HOOK="""
-${GAZEBO_MODEL_INSTALLATION}
-"""
-
-. ${SCRIPT_DIR}/lib/_ros_setup_buildsh.bash "gazebo_ros_pkgs"
-
-# don't have rosdep at this point and want gazebo to be cached by docker
-DEPENDENCY_PKGS="${ROS_GAZEBO_PKGS_DEPENDENCIES} ${_GZ_ROS_PACKAGES} wget"
-USE_ROS_REPO=true
-
-. ${SCRIPT_DIR}/lib/docker_generate_dockerfile.bash
-. ${SCRIPT_DIR}/lib/docker_run.bash
diff --git a/jenkins-scripts/docker/lib/gazebo_ros_pkgs-check-release.bash b/jenkins-scripts/docker/lib/gazebo_ros_pkgs-check-release.bash
deleted file mode 100644
index 6b7641c0e..000000000
--- a/jenkins-scripts/docker/lib/gazebo_ros_pkgs-check-release.bash
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash -x
-
-# Use always GPU in drcsim project
-export GPU_SUPPORT_NEEDED=true
-
-# Do not use the subprocess_reaper in debbuild. Seems not as needed as in
-# testing jobs and seems to be slow at the end of jenkins jobs
-export ENABLE_REAPER=false
-
-DOCKER_JOB_NAME="gazebo_ros_pkgs_ci"
-. ${SCRIPT_DIR}/lib/boilerplate_prepare.sh
-. ${SCRIPT_DIR}/lib/_common_scripts.bash
-. ${SCRIPT_DIR}/lib/_gazebo_utils.sh
-
-ROS_SETUP_PREINSTALL_HOOK="""
-${GAZEBO_MODEL_INSTALLATION}
-"""
-
-# Generate the first part of the build.sh file for ROS
-. ${SCRIPT_DIR}/lib/_ros_setup_buildsh.bash ""
-
-if ${ROS2}; then
-cat > build.sh << DELIM_CHECKOUT
-$(generate_buildsh_header)
-
-source /opt/ros/${ROS_DISTRO}/setup.bash
-TEST_TIMEOUT=90
-
-TEST_START=\`date +%s\`
-timeout --preserve-status \$TEST_TIMEOUT gazebo --verbose /opt/ros/${ROS_DISTRO}/share/gazebo_plugins/worlds/gazebo_ros_diff_drive_demo.world || true
-TEST_END=\`date +%s\`
-DIFF=\$(expr \$TEST_END - \$TEST_START)
-
-if [ \$DIFF -lt \$TEST_TIMEOUT ]; then
- echo 'The test took less than \$TEST_TIMEOUT. Something bad happened'
- exit 1
-fi
-DELIM_CHECKOUT
-else
-cat > build.sh << DELIM_CHECKOUT
-$(generate_buildsh_header)
-
-[[ -d ${WORKSPACE}/gazebo_ros_demos ]] && rm -fr ${WORKSPACE}/gazebo_ros_demos
-git clone https://github.com/ros-simulation/gazebo_ros_demos ${WORKSPACE}/gazebo_ros_demos
-DELIM_CHECKOUT
-
-# Generate the first part of the build.sh file for ROS
-. ${SCRIPT_DIR}/lib/_ros_setup_buildsh.bash "gazebo_ros_demos"
-# SOFTWARE_DIR is set by _ros_setup_buildsh.bash. In this job we are getting
-# the gazebo_ros_demos in the build.sh so we need to avoid the variable to
-# reach the docker file generation (it will try to copy it to the container)
-[[ -n ${SOFTWARE_DIR} ]] && unset SOFTWARE_DIR
-
-cat >> build.sh << DELIM
-
-TEST_TIMEOUT=90
-
-TEST_START=\`date +%s\`
-timeout --preserve-status \$TEST_TIMEOUT roslaunch gazebo_ros empty_world.launch verbose:=true || true
-TEST_END=\`date +%s\`
-DIFF=\$(expr \$TEST_END - \$TEST_START)
-
-if [ \$DIFF -lt \$TEST_TIMEOUT ]; then
- echo 'The test took less than \$TEST_TIMEOUT. Something bad happened'
- exit 1
-fi
-
-cd ${CATKIN_WS}
-source install/setup.bash
-
-TEST_TIMEOUT=180
-
-TEST_START=\`date +%s\`
-timeout --preserve-status \$TEST_TIMEOUT roslaunch rrbot_gazebo rrbot_world.launch headless:=true extra_gazebo_args:="--verbose"
-TEST_END=\`date +%s\`
-DIFF=\$(expr \$TEST_END - \$TEST_START)
-
-if [ \$DIFF -lt \$TEST_TIMEOUT ]; then
- echo 'The test took less than \$TEST_TIMEOUT. Something bad happened'
- exit 1
-fi
-
-echo "180 testing seconds finished successfully"
-DELIM
-fi
-
-USE_ROS_REPO=true
-
-# To be sure about getting the latest versions of all dependencies:
-# gazebo, sdformat, ignition ... we need to add them as packages in
-# DEPENDENCY_PKGS. They would be automatically pulled by ROS_GAZEBO_PKGS
-# but won't be updated if docker cache is in use. Adding them to the
-# list will do it.
-DEPENDENCY_PKGS="${ROS_CATKIN_BASE} git wget \
- ${ROS_GAZEBO_PKGS} \
- ${ROS_GAZEBO_PKGS_EXAMPLE_DEPS} \
- ${_GZ_ROS_PACKAGES}"
-
-. ${SCRIPT_DIR}/lib/docker_generate_dockerfile.bash
-. ${SCRIPT_DIR}/lib/docker_run.bash
diff --git a/jenkins-scripts/docker/lib/generic-abi-base.bash b/jenkins-scripts/docker/lib/generic-abi-base.bash
index c24ae0fea..13f6096ed 100644
--- a/jenkins-scripts/docker/lib/generic-abi-base.bash
+++ b/jenkins-scripts/docker/lib/generic-abi-base.bash
@@ -32,9 +32,6 @@ echo '# END SECTION'
if [[ "${ABI_JOB_PKG_DEPENDENCIES_VAR_NAME}" != "" ]]; then
eval ABI_JOB_PKG_DEPENDENCIES="\$${ABI_JOB_PKG_DEPENDENCIES_VAR_NAME} ${ABI_JOB_PKG_DEPENDENCIES}"
fi
-if [[ -n "${DART_FROM_PKGS_VAR_NAME}" ]]; then
- eval DART_FROM_PKGS="\$${DART_FROM_PKGS_VAR_NAME}"
-fi
if [[ -z "${ABI_JOB_HEADER_PREFIX}" ]]; then
eval ABI_JOB_HEADER_PREFIX="\$${ABI_JOB_SOFTWARE_NAME}-*"
fi
diff --git a/jenkins-scripts/dsl/gazebo.dsl b/jenkins-scripts/dsl/gazebo.dsl
deleted file mode 100644
index 3b3d0b3b0..000000000
--- a/jenkins-scripts/dsl/gazebo.dsl
+++ /dev/null
@@ -1,524 +0,0 @@
-import _configs_.*
-import javaposse.jobdsl.dsl.Job
-
-def gazebo_supported_branches = [ 'gazebo11' ]
-def gazebo_supported_build_types = [ 'Release', 'Debug', 'Coverage' ]
-// testing official packages without osrf repo
-def ubuntu_official_packages_distros = [ 'jammy' : 'gazebo11']
-// Main platform using for quick CI
-def ci_distro = [ 'focal' ]
-def ci_gpu = Globals.get_ci_gpu()
-def abi_distro = Globals.get_abi_distro()
-// Other supported platform to be checked but no for quick
-// CI integration.
-def other_supported_distros = Globals.get_other_supported_distros()
-def all_supported_distros = Globals.get_all_supported_distros()
-def supported_arches = Globals.get_supported_arches()
-def experimental_arches = Globals.get_experimental_arches()
-def all_supported_gpus = Globals.get_all_supported_gpus()
-
-def DISABLE_TESTS = false
-def DISABLE_GITHUB_INTEGRATION = false
-
-String ci_distro_str = ci_distro[0]
-String ci_gpu_str = ci_gpu[0]
-String ci_build_any_job_name_linux = "gazebo-ci-pr_any-ubuntu_auto-amd64-gpu-${ci_gpu_str}"
-
-// Need to be used in ci_pr
-String abi_job_name = ''
-
-boolean is_watched_by_buildcop(branch, distro = 'bionic', gpu = 'nvidia')
-
-{
- if (branch == 'master' || branch == 'gazebo11')
- return true
-
- return false
-}
-
-void generate_install_job(Job job, gz_branch, distro, arch, use_osrf_repos = false)
-{
- job.with
- {
- triggers {
- cron(Globals.CRON_EVERY_THREE_DAYS)
- }
-
- // Branch is exactly in the form of gazeboN
- def dev_packages = "lib${gz_branch}-dev ${gz_branch}"
- // Ubuntu Jammy has no versioned gazebo package
- if (distro == 'jammy')
- dev_packages = "libgazebo-dev gazebo"
-
- def gzdev_str = ""
- if (use_osrf_repos)
- gzdev_str = "export GZDEV_PROJECT_NAME=${gz_branch}"
-
- // Need gpu for running the runtime test
- label Globals.nontest_label("gpu-reliable")
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
- export ARCH=${arch}
- export INSTALL_JOB_PKG=\"${dev_packages}\"
- ${gzdev_str}
-
- /bin/bash -x ./scripts/jenkins-scripts/docker/gazebo-install-test-job.bash
- """.stripIndent())
- }
-
- publishers {
- consoleParsing {
- projectRules('scripts/jenkins-scripts/parser_rules/gazebo_err.parser')
- failBuildOnError(true)
- }
- }
- }
-}
-
-// ABI Checker job
-// Need to be the before ci-pr_any so the abi job name is defined
-abi_distro.each { distro ->
- supported_arches.each { arch ->
- abi_job_name = "gazebo-abichecker-any_to_any-ubuntu_auto-${arch}"
- def abi_job = job(abi_job_name)
- OSRFLinuxABIGitHub.create(abi_job)
- GenericAnyJobGitHub.create(abi_job, 'gazebosim/gazebo-classic', gazebo_supported_branches)
- abi_job.with
- {
- label Globals.nontest_label("large-memory")
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
-
- export ARCH=${arch}
- export DEST_BRANCH=\${DEST_BRANCH:-\$ghprbTargetBranch}
- export SRC_BRANCH=\${SRC_BRANCH:-\$ghprbSourceBranch}
- export SRC_REPO=\${SRC_REPO:-\$ghprbAuthorRepoGitUrl}
-
- /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-abichecker.bash
- """.stripIndent())
- } // end of steps
- } // end of with
- } // end of arch
-} // end of distro
-
-// CI JOBS @ SCM/5 min
-ci_distro.each { distro ->
- ci_gpu.each { gpu ->
- supported_arches.each { arch ->
- // --------------------------------------------------------------
- // 1. Create the any job
- def gazebo_ci_any_job_name = "gazebo-ci-pr_any-ubuntu_auto-${arch}-gpu-${gpu}"
- def gazebo_ci_any_job = job(gazebo_ci_any_job_name)
- OSRFLinuxCompilationAnyGitHub.create(gazebo_ci_any_job, "gazebosim/gazebo-classic")
- gazebo_ci_any_job.with
- {
- label Globals.nontest_label("gpu-reliable && large-memory")
-
- steps
- {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
-
- export ARCH=${arch}
- export GPU_SUPPORT_NEEDED=true
- /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash
- """.stripIndent())
- }
- }
-
- // reset build cop email in global list of mails
- Globals.extra_emails = ''
- } // end of gpu
- } // end of arch
-} // end of distro
-
-// OTHER CI SUPPORTED JOBS (gazebo11 branch) @ SCM/DAILY
-other_supported_distros.each { distro ->
- supported_arches.each { arch ->
-
- // get the supported gpus by distro
- gpus = Globals.gpu_by_distro[distro]
- if (gpus == null)
- gpus = [ 'none' ]
-
- gpus.each { gpu ->
- // gazebo11 job for the rest of arches / scm@daily
- def gazebo_ci_job = job("gazebo-ci-gazebo11-${distro}-${arch}-gpu-${gpu}")
- OSRFLinuxCompilation.create(gazebo_ci_job)
- OSRFGitHub.create(gazebo_ci_job, "gazebosim/gazebo-classic")
-
- gazebo_ci_job.with
- {
-
- // gazebo builds require a powerful node not to take too long and
- // block backup for hours
- label Globals.nontest_label("gpu-reliable && large-memory")
-
- triggers {
- scm('@daily')
- }
-
- String gpu_needed = 'true'
- if (gpu == 'none') {
- gpu_needed = 'false'
- }
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
- export ARCH=${arch}
- export GPU_SUPPORT_NEEDED=${gpu_needed}
- /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash
- """.stripIndent())
- }
- }
- } // end of gpus
- } // end of arch
-} // end of distro
-
-// sdformat and ignition dependencies
-ci_distro.each { distro ->
- supported_arches.each { arch ->
- ci_gpu.each { gpu ->
- def multi_any_job = job("gazebo-ci-pr_any+sdformat_any+ign_any-${distro}-${arch}-gpu-${gpu}")
- OSRFLinuxCompilationAnyGitHub.create(multi_any_job, "gazebosim/gazebo-classic", true, true, [], DISABLE_GITHUB_INTEGRATION)
- multi_any_job.with
- {
- parameters
- {
- stringParam('SDFORMAT_BRANCH', 'main', 'sdformat branch to use')
- stringParam('IGN_MATH_BRANCH', 'main', 'ignition math branch to use')
- stringParam('IGN_TRANSPORT_BRANCH', 'main', 'ignition transport branch to use')
- }
-
- label Globals.nontest_label("gpu-reliable")
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
- export ARCH=${arch}
- export GPU_SUPPORT_NEEDED=true
- export GAZEBO_BUILD_SDFORMAT=true
- export GAZEBO_BUILD_GZ_MATH=true
- export GAZEBO_BUILD_GZ_TRANSPORT=true
- /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash
- """.stripIndent())
- }
- }
- }
- }
-}
-
-// BRANCHES CI JOB @ SCM/DAILY
-gazebo_supported_branches.each { branch ->
- distros = ci_distro
- distros.each { distro ->
- supported_arches.each { arch ->
- ci_gpu.each { gpu ->
- // ci_default job for the rest of arches / scm@daily
- def gazebo_ci_job = job("gazebo-ci-${branch}-${distro}-${arch}-gpu-${gpu}")
- // note that we are already using the CI reference GPU and distro, no
- // need to check for build_cop email
- if (is_watched_by_buildcop(branch, distro, gpu))
- Globals.extra_emails = Globals.build_cop_email
- OSRFLinuxCompilation.create(gazebo_ci_job)
- OSRFGitHub.create(gazebo_ci_job, "gazebosim/gazebo-classic", branch)
-
- gazebo_ci_job.with
- {
- label Globals.nontest_label("gpu-reliable && large-memory")
-
- triggers {
- scm('@daily')
- }
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
- export ARCH=${arch}
- export GPU_SUPPORT_NEEDED=true
- /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash
- """.stripIndent())
- }
- }
-
- // reset build cop email in global list of mails
- Globals.extra_emails = ""
- } // end of gpu
- } // end of arch
- } // end of distro
-} // end of branch
-
-// EXPERIMENTAL ARCHES @ SCM/WEEKLY
-ci_distro.each { distro ->
- experimental_arches.each { arch ->
- def gazebo_ci_job = job("gazebo-ci-gazebo11-${distro}-${arch}-gpu-none")
- OSRFLinuxCompilation.create(gazebo_ci_job)
- OSRFGitHub.create(gazebo_ci_job, "gazebosim/gazebo-classic", "gazebo11")
-
- gazebo_ci_job.with
- {
- label Globals.nontest_label("gpu-reliable && large-memory")
-
- triggers {
- scm('@weekly')
- }
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
- export ARCH=${arch}
- export GPU_SUPPORT_NEEDED=false
- /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash
- """.stripIndent())
- }
- }
- }
-}
-
-// COVERAGE TYPE @ SCM/DAILY
-ci_distro.each { distro ->
- supported_arches.each { arch ->
- ci_gpu.each { gpu ->
- def gazebo_ci_job = job("gazebo-ci-coverage-${distro}-${arch}-gpu-${gpu}")
- OSRFLinuxCompilation.create(gazebo_ci_job)
- OSRFGitHub.create(gazebo_ci_job, "gazebosim/gazebo-classic", "gazebo11")
- gazebo_ci_job.with
- {
- triggers {
- scm('@daily')
- }
-
- label Globals.nontest_label("gpu-reliable && large-memory")
-
- // Problem with the compilation of Gazebo under bullseyes
- // See: https://github.com/gazebo-tooling/release-tools/issues/129
- disabled()
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
- export ARCH=${arch}
- export GPU_SUPPORT_NEEDED=false
- export COVERAGE_ENABLED=true
- /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash
- """.stripIndent())
- }
- }
- }
- }
-}
-
-// BUILD TYPES CI JOBS @ SCM/DAILY
-ci_distro.each { distro ->
- supported_arches.each { arch ->
- gazebo_supported_build_types.each { build_type ->
- def gazebo_ci_job = job("gazebo-ci_BT${build_type}-gazebo11-${distro}-${arch}-gpu-none")
- OSRFLinuxCompilation.create(gazebo_ci_job)
- OSRFGitHub.create(gazebo_ci_job, "gazebosim/gazebo-classic", "gazebo11")
-
- gazebo_ci_job.with
- {
- label Globals.nontest_label("gpu-reliable && large-memory")
-
- triggers {
- scm('@daily')
- }
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
- export ARCH=${arch}
- export GPU_SUPPORT_NEEDED=false
- export GAZEBO_BASE_CMAKE_ARGS="-DCMAKE_BUILD_TYPE=${build_type}"
- /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash
- """.stripIndent())
- }
- }
-
- }
- }
-}
-
-// INSTALL ONELINER
-all_supported_distros.each { distro ->
- supported_arches.each { arch ->
- // --------------------------------------------------------------
- def install_default_job = job("gazebo-install-one_liner-${distro}-${arch}")
- OSRFLinuxInstall.create(install_default_job)
- install_default_job.with
- {
- triggers {
- cron(Globals.CRON_EVERY_THREE_DAYS)
- }
-
- label Globals.nontest_label("gpu-reliable")
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export DISTRO=${distro}
- export ARCH=${arch}
- /bin/bash -x ./scripts/jenkins-scripts/docker/gazebo-one-line-install-test-job.bash
- """.stripIndent())
- }
- } // end of with
- } // end of arch
-} // end of distro
-
-// INSTALL LINUX -DEV PACKAGES ALL PLATFORMS @ CRON/DAILY
-gazebo_supported_branches.each { branch ->
- distros = ci_distro
- distros.each { distro ->
- supported_arches.each { arch ->
- // --------------------------------------------------------------
- def install_default_job = job("gazebo-install-${branch}_pkg-${distro}-${arch}")
- OSRFLinuxInstall.create(install_default_job)
-
- generate_install_job(install_default_job, branch, distro, arch, true)
- } // end of arch
- } // end of distro
-} // end of branch
-
-// INSTALL LINUX -DEV PACKAGES ALL PLATFORMS @ CRON/DAILY - ONLY UBUNTU OFFICIAL
-// PACKAGES
-ubuntu_official_packages_distros.each { distro, branch ->
- supported_arches.each { arch ->
- // --------------------------------------------------------------
- def install_default_job = job("gazebo-install_ubuntu_official-${branch}_pkg-${distro}-${arch}")
- OSRFLinuxInstall.create(install_default_job)
-
- generate_install_job(install_default_job, branch, distro, arch)
- } // end of arch
-} // end of branch
-
-// --------------------------------------------------------------
-// DEBBUILD: linux package builder
-
-all_debbuild_branches = gazebo_supported_branches
-all_debbuild_branches.each { branch ->
- def build_pkg_job = job("${branch}-debbuilder")
- OSRFLinuxBuildPkg.create(build_pkg_job)
- OSRFCredentials.allowOsrfbuildToRunTheBuild(build_pkg_job)
-
- build_pkg_job.with
- {
- steps {
- shell("""\
- #!/bin/bash -xe
-
- export ENABLE_ROS=false
- /bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-debbuild.bash
- """.stripIndent())
- }
- }
-}
-
-// - SOURCE jobs ---------------------------------------------------
-def gz_source_job = job("gazebo11-source")
-OSRFSourceCreation.create(gz_source_job, [
- PACKAGE: 'gazebo11',
- SOURCE_REPO_URI: "https://github.com/gazebosim/gazebo-classic.git"])
-OSRFSourceCreation.call_uploader_and_releasepy(gz_source_job,
- 'repository_uploader_packages',
- '_releasepy')
-
-// --------------------------------------------------------------
-// BREW: CI jobs
-
-// 1. ANY job @ SCM/5min
-String ci_build_any_job_name_brew = "gazebo-ci-pr_any-homebrew-amd64"
-def gazebo_brew_ci_any_job = job(ci_build_any_job_name_brew)
-OSRFBrewCompilationAnyGitHub.create(gazebo_brew_ci_any_job, "gazebosim/gazebo-classic")
-gazebo_brew_ci_any_job.with
-{
- label Globals.nontest_label("osx")
- steps {
- shell("""\
- #!/bin/bash -xe
-
- /bin/bash -xe ./scripts/jenkins-scripts/gazebo-default-devel-homebrew-amd64.bash
- """.stripIndent())
- }
-}
-
-def install_brew_job = job("gazebo-install-one_liner-homebrew-amd64")
-OSRFOsXBase.create(install_brew_job)
-install_brew_job.with
-{
- triggers {
- cron('@daily')
- }
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- /bin/bash -xe ./scripts/jenkins-scripts/gazebo-one_liner-homebrew.bash
- """.stripIndent())
- }
-}
-
-// 2. default in all branches @SCM/daily
-// No gazebo2 for brew
-all_branches = gazebo_supported_branches
-all_branches.each { branch ->
- if (is_watched_by_buildcop(branch))
- Globals.extra_emails = Globals.build_cop_email
-
- def osx_label = 'osx'
-
- def gazebo_brew_ci_job = job("gazebo-ci-${branch}-homebrew-amd64")
- OSRFBrewCompilation.create(gazebo_brew_ci_job)
- OSRFGitHub.create(gazebo_brew_ci_job, "gazebosim/gazebo-classic", branch)
-
- gazebo_brew_ci_job.with
- {
- label osx_label
-
- triggers {
- scm("TZ=US/Pacific \n H H(0-17) * * *")
- }
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- /bin/bash -xe ./scripts/jenkins-scripts/gazebo-default-devel-homebrew-amd64.bash
- """.stripIndent())
- }
- }
-
- // reset build cop email in global list of mails
- Globals.extra_emails = ""
-}
-
-// --------------------------------------------------------------
-// Create the main CI work flow job
-def gazebo_ci_main = pipelineJob("gazebo-ci-manual_any")
-OSRFCIWorkFlowMultiAnyGitHub.create(gazebo_ci_main,
- [ci_build_any_job_name_linux,
- ci_build_any_job_name_brew])
diff --git a/jenkins-scripts/dsl/gazebo_ros_pkgs.dsl b/jenkins-scripts/dsl/gazebo_ros_pkgs.dsl
deleted file mode 100644
index 34342e25e..000000000
--- a/jenkins-scripts/dsl/gazebo_ros_pkgs.dsl
+++ /dev/null
@@ -1,338 +0,0 @@
-import _configs_.*
-import javaposse.jobdsl.dsl.Job
-import groovy.transform.Field
-
-@Field
-ArrayList ros_distros = Globals.get_ros_suported_distros()
-@Field
-String ci_arch = 'amd64'
-@Field
-ArrayList ros2_distros = [ 'foxy' ]
-
-@Field
-Boolean ENABLE_TESTS = true
-@Field
-Boolean DISABLE_CPPCHECK = false
-
-// version to test more than the official one in each ROS distro
-extra_gazebo_versions = [ 'melodic' : ['11']]
-
-bloom_debbuild_jobs = [ 'gazebo-dev', 'gazebo-msgs', 'gazebo-plugins', 'gazebo-ros', 'gazebo-ros-control', 'gazebo-ros-pkgs' ]
-
-// ROS1 branches use $ros_distro-devel schema
-// ROS2 branches use $ros_distro with the expections:
-String get_branch_from_rosdistro(ros_distro) {
- if (! ros2_distros.contains(ros_distro))
- return "${ros_distro}-devel"
-
- return ros_distro
-}
-
-Job create_pr_compilation(String job_name,
- String ubuntu_distro,
- String ros_distro,
- String gz_version,
- String script_name)
-{
- def comp_job = job(job_name)
-
- OSRFLinuxCompilationAnyGitHub.create(comp_job,
- "ros-simulation/gazebo_ros_pkgs",
- ENABLE_TESTS,
- DISABLE_CPPCHECK,
- [ get_branch_from_rosdistro(ros_distro) ])
- include_common_params(comp_job,
- ubuntu_distro,
- ros_distro,
- gz_version,
- script_name)
- return comp_job
-}
-
-Job create_ci_compilation(String job_name,
- String ubuntu_distro,
- String ros_distro,
- String gz_version,
- String script_name)
-{
- def default_ci_job = job(job_name)
- OSRFLinuxCompilation.create(default_ci_job, ENABLE_TESTS, DISABLE_CPPCHECK)
- OSRFGitHub.create(default_ci_job,
- "ros-simulation/gazebo_ros_pkgs",
- get_branch_from_rosdistro(ros_distro))
- include_common_params(default_ci_job,
- ubuntu_distro,
- ros_distro,
- gz_version,
- script_name)
-
- default_ci_job.with
- {
- triggers {
- scm('*/5 * * * *')
- }
- }
-
- return default_ci_job
-}
-
-
-void include_common_params(Job gazebo_ros_pkgs_job,
- String ubuntu_distro,
- String ros_distro,
- String gz_version,
- String script_name,
- String ros_repo_name = "")
-{
- gazebo_ros_pkgs_job.with
- {
- if (gz_version != "default") {
- gz_package_version_str = """\
- export GAZEBO_VERSION_FOR_ROS="${gz_version}"
- export USE_GZ_VERSION_ROSDEP=true
- export OSRF_REPOS_TO_USE="stable"
- """.stripIndent()
- } else {
- gz_package_version_str = """\
- export USE_DEFAULT_GAZEBO_VERSION_FOR_ROS=true
- export OSRF_REPOS_TO_USE="stable"
- """.stripIndent()
- }
-
- if (ros2_distros.contains(ros_distro)) {
- ros2_str = "export ROS2=true"
- } else {
- ros2_str = "export ROS2=false"
- }
-
- label Globals.nontest_label("gpu-reliable")
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- ${gz_package_version_str}
-
- export ENABLE_ROS=true
- ${ros2_str}
- export DISTRO=${ubuntu_distro}
- export ARCH=${ci_arch}
- export ROS_DISTRO=${ros_distro}
- export ROS_REPO_NAME=${ros_repo_name}
- /bin/bash -xe ./scripts/jenkins-scripts/docker/${script_name}.bash
- """.stripIndent())
- }
- }
-}
-
-(ros_distros + ros2_distros).each { ros_distro ->
- ubuntu_distros = Globals.ros_ci[ros_distro]
-
- ubuntu_distros.each { ubuntu_distro ->
- suffix_triplet="${ros_distro}-${ubuntu_distro}-${ci_arch}"
-
- if (ros2_distros.contains(ros_distro)) {
- name_prefix = "ros2"
- } else {
- name_prefix = "ros"
- }
-
- // --------------------------------------------------------------
- // 1. Create the default ci jobs (using ros-shadow-fixed by default)
- def default_ci_job_name = "${name_prefix}_gazebo_pkgs-ci-default_$suffix_triplet"
- Job default_ci_job = create_ci_compilation(default_ci_job_name,
- ubuntu_distro,
- ros_distro,
- "default",
- "gazebo_ros_pkgs-compilation")
-
- // --------------------------------------------------------------
- // 2. Create the default ci pr-any jobs
- def any_job_name = "${name_prefix}_gazebo_pkgs-ci-pr_any_${suffix_triplet}"
- Job any_job = create_pr_compilation(any_job_name,
- ubuntu_distro,
- ros_distro,
- "default",
- "gazebo_ros_pkgs-compilation")
-
- // --------------------------------------------------------------
- // 3. Create the default install (by default use ros-shadow)
- def install_default_job = job("${name_prefix}_gazebo_pkgs-install_pkg_${suffix_triplet}")
- OSRFLinuxInstall.create(install_default_job)
- include_common_params(install_default_job,
- ubuntu_distro,
- ros_distro,
- "default",
- "gazebo_ros_pkgs-release-testing")
- install_default_job.with
- {
- triggers {
- cron(Globals.CRON_EVERY_THREE_DAYS)
- }
- }
-
- // --------------------------------------------------------------
- // 3. Create the default install using stable ROS repo
- def install_stable_default_job = job("${name_prefix}_gazebo_pkgs-install_pkg_stable_ros_${suffix_triplet}")
- OSRFLinuxInstall.create(install_stable_default_job)
- include_common_params(install_stable_default_job,
- ubuntu_distro,
- ros_distro,
- "default",
- "gazebo_ros_pkgs-release-testing",
- "ros")
- install_stable_default_job.with
- {
- triggers {
- cron(Globals.CRON_EVERY_THREE_DAYS)
- }
- }
-
- // Assume that gazebo means official version chose by ROS on every distribution
- gazebo_unofficial_versions = extra_gazebo_versions[ros_distro]
- gazebo_unofficial_versions.each { gz_version ->
- // Do not generate special jobs for official supported package. They will
- // be created using plain 'gazebo' name.
- if (! (gz_version in Globals.gz_version_by_rosdistro[ros_distro]))
- {
- // --------------------------------------------------------------
- // 1.2 Testing packages jobs install_pkg
- def install_alternative_job = job("${name_prefix}_gazebo${gz_version}_pkgs-install_pkg_${suffix_triplet}")
- OSRFLinuxInstall.create(install_alternative_job)
- include_common_params(install_alternative_job,
- ubuntu_distro,
- ros_distro,
- gz_version,
- "gazebo_ros_pkgs-release-testing")
- install_alternative_job.with
- {
- triggers {
- cron(Globals.CRON_EVERY_THREE_DAYS)
- }
- }
-
- // --------------------------------------------------------------
- // 2.2 Extra ci pr-any jobs
- def ci_pr_job_name = "${name_prefix}_gazebo${gz_version}_pkgs-ci-pr_any_${suffix_triplet}"
- Job ci_pr_job = create_pr_compilation(ci_pr_job_name,
- ubuntu_distro,
- ros_distro,
- gz_version,
- "gazebo_ros_pkgs-compilation")
-
- // --------------------------------------------------------------
- // 3.2 Extra default ci jobs
- def extra_ci_job_name = "${name_prefix}_gazebo${gz_version}_pkgs-ci-default_$suffix_triplet"
- Job extra_ci_job = create_ci_compilation(extra_ci_job_name,
- ubuntu_distro,
- ros_distro,
- gz_version,
- "gazebo_ros_pkgs-compilation")
- }
- } // end of gazebo_versions
-
- // Regresssion jobs only in ROS1 by now
- if (ros_distros.contains(ros_distro)) {
- // --------------------------------------------------------------
- // 2. Create the regressions ci pr-any jobs
- def regression_job_name = "${name_prefix}_gazebo_pkgs-ci-pr_regression_any_${suffix_triplet}"
- Job regression_job = create_pr_compilation(regression_job_name,
- ubuntu_distro,
- ros_distro,
- "default",
- "gazebo_ros_pkgs-compilation_regression")
- // No melodic-devel branch in third party testing (yet)
- if (ros_distro == 'melodic' || ros_distro == 'noetic')
- {
- regression_job.with
- {
- disabled()
- }
- }
- } // end of non development
- } // end of ubuntu_distros
-} // end of ros_distros
-
-bloom_debbuild_jobs.each { bloom_pkg ->
-
- postfix_job_str = "bloom-debbuilder"
- def build_pkg_job = job("${bloom_pkg}-${postfix_job_str}")
-
- // Use the linux install as base
- OSRFLinuxBuildPkgBase.create(build_pkg_job)
-
- build_pkg_job.with
- {
- properties {
- priority 100
- }
-
- configure { project ->
- project / 'properties' / 'hudson.plugins.copyartifact.CopyArtifactPermissionProperty' / 'projectNameList' {
- 'string' 'repository_uploader_*'
- }
- }
-
- parameters {
- stringParam("PACKAGE","${bloom_pkg}","Package name to be built")
- stringParam("VERSION",null,"Packages version to be built")
- stringParam("RELEASE_VERSION", null, "Packages release version")
- stringParam("LINUX_DISTRO", 'ubuntu', "Linux distribution to build packages for")
- stringParam("DISTRO", null, "Linux release inside LINUX_DISTRO to build packages for")
- stringParam("ARCH", null, "Architecture to build packages for")
- stringParam('ROS_DISTRO', '','ROS DISTRO to build pakcages for')
- stringParam("UPLOAD_TO_REPO", null, "OSRF repo name to upload the package to")
- stringParam('UPSTREAM_RELEASE_REPO', '', 'https://github.com/ros-gbp/gazebo_ros_pkgs-release')
- booleanParam('ROS2', false, 'Whether it is a ROS2 release')
- }
-
- // Blocks to control dependencies
- if ("${bloom_pkg}" == 'gazebo-ros')
- blockOn(["gazebo-dev-${postfix_job_str}","gazebo-msgs-${postfix_job_str}"])
- else if ("${bloom_pkg}" == 'gazebo-plugins')
- blockOn(["gazebo-dev-${postfix_job_str}","gazebo-msgs-${postfix_job_str}"])
- else if ("${bloom_pkg}" == 'gazebo-ros-control')
- blockOn(["gazebo-dev-${postfix_job_str}","gazebo-msgs-${postfix_job_str}","gazebo-ros-${postfix_job_str}"])
- else if ("${bloom_pkg}" == 'gazebo-ros-pkgs')
- blockOn(["gazebo-dev-${postfix_job_str}","gazebo-msgs-${postfix_job_str}","gazebo-ros-${postfix_job_str}"])
-
- steps {
- systemGroovyCommand("""\
- build.setDescription(
- '' + build.buildVariableResolver.resolve('ROS_DISTRO') + '-'
- + build.buildVariableResolver.resolve('VERSION') + '-'
- + build.buildVariableResolver.resolve('RELEASE_VERSION') + '' +
- '(' + build.buildVariableResolver.resolve('LINUX_DISTRO') + '/' +
- build.buildVariableResolver.resolve('DISTRO') + '::' +
- build.buildVariableResolver.resolve('ARCH') + ')' +
- '
' +
- 'upload to: ' + build.buildVariableResolver.resolve('UPLOAD_TO_REPO') +
- '
' +
- 'RTOOLS_BRANCH: ' + build.buildVariableResolver.resolve('RTOOLS_BRANCH'));
- """.stripIndent()
- )
- }
-
- publishers {
- downstreamParameterized {
- trigger('repository_uploader_packages') {
- condition('SUCCESS')
- parameters {
- currentBuild()
- predefinedProp("PROJECT_NAME_TO_COPY_ARTIFACTS", "\${JOB_NAME}")
- predefinedProp("PACKAGE_ALIAS", "\${JOB_NAME}")
- }
- }
- }
- }
-
-
- steps {
- shell("""\
- #!/bin/bash -xe
-
- /bin/bash -x ./scripts/jenkins-scripts/docker/bloom-debbuild.bash
- """.stripIndent())
- }
- }
-}
diff --git a/jenkins-scripts/gazebo-default-devel-homebrew-amd64.bash b/jenkins-scripts/gazebo-default-devel-homebrew-amd64.bash
deleted file mode 100644
index 36618ae4d..000000000
--- a/jenkins-scripts/gazebo-default-devel-homebrew-amd64.bash
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash -x
-
-# Knowing Script dir beware of symlink
-[[ -L ${0} ]] && SCRIPT_DIR=$(readlink ${0}) || SCRIPT_DIR=${0}
-SCRIPT_DIR="${SCRIPT_DIR%/*}"
-
-RERUN_FAILED_TESTS=1
-
-PRE_TESTS_EXECUTION_HOOK="""
-echo '#BEGIN SECTION: compile the tests suite'
-make tests -j\${MAKE_JOBS} \${MAKE_VERBOSE_STR}
-echo '# END SECTION'
-"""
-
-# clear the heightmap paging cache
-rm -rf $HOME/.gazebo/paging
-
-. ${SCRIPT_DIR}/lib/project-default-devel-homebrew-amd64.bash gazebo-classic
diff --git a/jenkins-scripts/gazebo-one_liner-homebrew.bash b/jenkins-scripts/gazebo-one_liner-homebrew.bash
deleted file mode 100644
index 36d2e4a26..000000000
--- a/jenkins-scripts/gazebo-one_liner-homebrew.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -xe
-
-# Knowing Script dir beware of symlink
-[[ -L ${0} ]] && SCRIPT_DIR=$(readlink ${0}) || SCRIPT_DIR=${0}
-SCRIPT_DIR="${SCRIPT_DIR%/*}"
-
-echo '# BEGIN SECTION: cleanup brew installation'
-. ${SCRIPT_DIR}/lib/_homebrew_cleanup.bash
-echo '# END SECTION'
-
-echo '# BEGIN SECTION: run the one-liner installation'
-curl -sSL https://get.gazebosim.org | sh -x
-# to test undeployed changes to gazebo.sh, comment out the
-# curl invocation and uncomment the line below
-# sh -x ${SCRIPT_DIR}/../one-line-installations/gazebo.sh
-echo '# END SECTION'
diff --git a/jenkins-scripts/lib/dependencies_archive.sh b/jenkins-scripts/lib/dependencies_archive.sh
index d52c69bba..f925dd51c 100644
--- a/jenkins-scripts/lib/dependencies_archive.sh
+++ b/jenkins-scripts/lib/dependencies_archive.sh
@@ -3,19 +3,6 @@
# **** WARNING ***** : when modifying this file
# **** WARNING ***** : any trailing whitespaces will break dependencies scapes
-# Dart flags. Enable it by default unless compiled from source
-if [ -z ${DART_COMPILE_FROM_SOURCE} ]; then
- DART_COMPILE_FROM_SOURCE=false
-fi
-
-if [ -z ${DART_FROM_PKGS} ]; then
- DART_FROM_PKGS=false
-fi
-
-if ${DART_COMPILE_FROM_SOURCE}; then
- DART_FROM_PKGS=false
-fi
-
pythonv="python3"
if [[ ${DISTRO} == 'trusty' ]]; then
pythonv="python"
@@ -99,147 +86,17 @@ else
SDFORMAT_BASE_DEPENDENCIES="${SDFORMAT_NO_GZ_DEPENDENCIES}"
fi
-# GAZEBO related dependencies. Default value points to the development version
-# of gazebo, it is being used by compile from source tutorial
-if [[ -z ${GAZEBO_MAJOR_VERSION} ]]; then
- GAZEBO_MAJOR_VERSION=11
-fi
-
-# Need to explicit define to use old sdformat package
-if [[ -z ${USE_OLD_SDFORMAT} ]]; then
- USE_OLD_SDFORMAT=false
-fi
-
-if ${USE_OLD_SDFORMAT}; then
- sdformat_pkg="sdformat"
-elif [[ ${GAZEBO_MAJOR_VERSION} -ge 11 ]]; then
- sdformat_pkg="libsdformat9-dev"
-elif [[ ${GAZEBO_MAJOR_VERSION} -ge 9 ]]; then
- sdformat_pkg="libsdformat6-dev"
-fi
-
ogre_pkg="libogre-1.9-dev"
if [[ ${DISTRO} != 'xenial' ]]; then
ogre_pkg="libogre-1.9-dev libogre-2.1-dev"
fi
-# Starting from utopic, we are using the bullet provided by ubuntu
-bullet_pkg="libbullet-dev"
-
-# choose dart version
-if $DART_FROM_PKGS; then
- dart_pkgs="libdart-utils-urdf-dev \
- libdart-external-odelcpsolver-dev \
- libdart-external-ikfast-dev"
- if [[ ${GAZEBO_MAJOR_VERSION} -ge 11 ]]; then
- dart_pkgs="${dart_pkgs} libdart-collision-bullet-dev \
- libdart-collision-ode-dev"
- fi
- # If on Bionic/Xenial use custom dart packages, these have a different name
- # dart -> dart6
- if [[ ${DISTRO} == 'bionic' ]] || [[ ${DISTRO} == 'xenial' ]]; then
- dart_pkgs="${dart_pkgs//dart/dart6}"
- fi
-fi
-
-# --------------------------------------
-# GAZEBO classic
-# --------------------------------------
-
-GAZEBO_BASE_DEPENDENCIES_NO_SDFORMAT="libfreeimage-dev \\
- libprotoc-dev \\
- libprotobuf-dev \\
- protobuf-compiler \\
- freeglut3-dev \\
- libcurl4-openssl-dev \\
- libtinyxml-dev \\
- libtinyxml2-dev \\
- libtar-dev \\
- libtbb-dev \\
- ${ogre_pkg} \\
- libxml2-dev \\
- pkg-config \\
- qtbase5-dev \\
- libqwt-qt5-dev \\
- libltdl-dev \\
- libgts-dev \\
- libboost-thread-dev \\
- libboost-system-dev \\
- libboost-filesystem-dev \\
- libboost-program-options-dev \\
- libboost-regex-dev \\
- libboost-iostreams-dev \\
- ${bullet_pkg} \\
- libsimbody-dev \\
- ${dart_pkgs}"
-
-if [[ ${GAZEBO_MAJOR_VERSION} -ge 11 ]]; then
- GAZEBO_BASE_DEPENDENCIES_NO_SDFORMAT="${GAZEBO_BASE_DEPENDENCIES_NO_SDFORMAT} \\
- libignition-common3-dev \\
- libignition-fuel-tools4-dev \\
- libignition-transport8-dev \\
- libignition-math6-dev \\
- libignition-msgs5-dev"
-elif [[ ${GAZEBO_MAJOR_VERSION} -ge 9 ]]; then
- GAZEBO_BASE_DEPENDENCIES_NO_SDFORMAT="${GAZEBO_BASE_DEPENDENCIES_NO_SDFORMAT} \\
- libignition-common-dev \\
- libignition-fuel-tools1-dev \\
- libignition-transport4-dev \\
- libignition-math4-dev \\
- libignition-msgs-dev"
-fi
-
-GAZEBO_BASE_DEPENDENCIES="${GAZEBO_BASE_DEPENDENCIES_NO_SDFORMAT} \\
- ${sdformat_pkg}"
-
-GAZEBO_EXTRA_DEPENDENCIES="libavformat-dev \\
- libavcodec-dev \\
- libgdal-dev \\
- libgraphviz-dev \\
- libswscale-dev \\
- libavdevice-dev \\
- ruby-ronn"
-
-
if [[ -z $ROS_DISTRO ]]; then
echo "------------------------------------------------------------"
echo "ROS_DISTRO was not set before using dependencies_archive.sh!"
echo "skipping ROS related variables"
echo "------------------------------------------------------------"
else
- # default versions for every ROS distribution
- if [[ -z ${GAZEBO_VERSION_FOR_ROS} ]]; then
- case ${ROS_DISTRO} in
- melodic)
- GAZEBO_VERSION_FOR_ROS="9"
- ;;
- noetic)
- GAZEBO_VERSION_FOR_ROS="11"
- ;;
- # ROS 2
- foxy)
- GAZEBO_VERSION_FOR_ROS="11"
- ;;
- rolling)
- GAZEBO_VERSION_FOR_ROS="11"
- esac
- fi
-
- case ${GAZEBO_VERSION_FOR_ROS} in
- *)
- # Rolling is supported only on Jammy. Gazebo11 packages from Jammy
- # are coming directly from Ubuntu repositories, package names are
- # unversioned
- if [[ ${DISTRO} == 'jammy' ]]; then
- _GZ_ROS_PACKAGES="libgazebo-dev gazebo"
- else
- # both packages see http://answers.ros.org/question/217970
- _GZ_ROS_PACKAGES="libgazebo${GAZEBO_VERSION_FOR_ROS}-dev \\
- gazebo${GAZEBO_VERSION_FOR_ROS}"
- fi
- ;;
- esac
-
# colcon has no python2 candidate
if ${ROS2}; then
ROS_CATKIN_BASE="${pythonv}-dev \\
@@ -262,110 +119,6 @@ else
${pythonv}-rospkg \\
${pythonv}-vcstools"
fi
-
- #
- # ROS_GAZEBO_PKGS DEPENDECIES
- #
- ROS_GAZEBO_PKGS_COMMON_DEPS="${ROS_CATKIN_BASE} \\
- libtinyxml-dev \\
- ros-${ROS_DISTRO}-std-msgs \\
- ros-${ROS_DISTRO}-trajectory-msgs \\
- ros-${ROS_DISTRO}-sensor-msgs \\
- ros-${ROS_DISTRO}-geometry-msgs"
-
- if ${ROS2}; then
- # Most of the base deps (ament, lint, rclcpp) are already included in
- # ROS_CATKIN_BASE. TODO: change var name
- ROS_GAZEBO_PKGS_DEPENDENCIES="${ROS_GAZEBO_PKGS_COMMON_DEPS} \\
- ros-${ROS_DISTRO}-builtin-interfaces \\
- ros-${ROS_DISTRO}-rosidl-default-runtime \\
- ros-${ROS_DISTRO}-rosidl-default-generators"
- else
- #
- # ROS1
- #
- ROS_GAZEBO_PKGS_DEPENDENCIES="${ROS_GAZEBO_PKGS_COMMON_DEPS} \\
- ros-${ROS_DISTRO}-ros \\
- ros-${ROS_DISTRO}-catkin \\
- ros-${ROS_DISTRO}-pluginlib \\
- ros-${ROS_DISTRO}-roscpp \\
- ros-${ROS_DISTRO}-angles \\
- ros-${ROS_DISTRO}-camera-info-manager \\
- ros-${ROS_DISTRO}-cmake-modules \\
- ros-${ROS_DISTRO}-controller-manager \\
- ros-${ROS_DISTRO}-control-toolbox \\
- ros-${ROS_DISTRO}-tf \\
- ros-${ROS_DISTRO}-cv-bridge \\
- ros-${ROS_DISTRO}-diagnostic-updater \\
- ros-${ROS_DISTRO}-dynamic-reconfigure \\
- ros-${ROS_DISTRO}-image-transport \\
- ros-${ROS_DISTRO}-joint-limits-interface \\
- ros-${ROS_DISTRO}-message-generation \\
- ros-${ROS_DISTRO}-nav-msgs \\
- ros-${ROS_DISTRO}-nodelet \\
- ros-${ROS_DISTRO}-pcl-conversions \\
- ros-${ROS_DISTRO}-polled-camera \\
- ros-${ROS_DISTRO}-rosconsole \\
- ros-${ROS_DISTRO}-rosgraph-msgs \\
- ros-${ROS_DISTRO}-std-srvs \\
- ros-${ROS_DISTRO}-tf \\
- ros-${ROS_DISTRO}-tf2-ros \\
- ros-${ROS_DISTRO}-transmission-interface \\
- ros-${ROS_DISTRO}-urdf \\
- ros-${ROS_DISTRO}-xacro"
-
- ROS_GAZEBO_PKGS_EXAMPLE_DEPS="ros-${ROS_DISTRO}-xacro \\
- ${ROS_GAZEBO_PKGS_EXAMPLE_DEPS}"
- fi
-
- ROS_GAZEBO_PKGS_DEPENDENCIES="${ROS_GAZEBO_PKGS_DEPENDENCIES} \\
- ${_GZ_ROS_PACKAGES}"
-
- if [[ -n ${USE_DEFAULT_GAZEBO_VERSION_FOR_ROS} ]] && ${USE_DEFAULT_GAZEBO_VERSION_FOR_ROS}; then
- ROS_GAZEBO_PKGS="ros-${ROS_DISTRO}-gazebo-msgs \
- ros-${ROS_DISTRO}-gazebo-plugins \
- ros-${ROS_DISTRO}-gazebo-ros \
- ros-${ROS_DISTRO}-gazebo-ros-pkgs"
- # no ros-control in ROS2 yet
- if ! ${ROS2}; then
- # TODO(sloretz) Install gazebo-ros-control when it's ported to ROS 2
- ROS_GAZEBO_PKGS="${ROS_GAZEBO_PKGS} \
- ros-${ROS_DISTRO}-gazebo-ros-control"
- fi
- else
- ROS_GAZEBO_PKGS="ros-${ROS_DISTRO}-gazebo${GAZEBO_VERSION_FOR_ROS}-msgs \
- ros-${ROS_DISTRO}-gazebo${GAZEBO_VERSION_FOR_ROS}-plugins \
- ros-${ROS_DISTRO}-gazebo${GAZEBO_VERSION_FOR_ROS}-ros \
- ros-${ROS_DISTRO}-gazebo${GAZEBO_VERSION_FOR_ROS}-ros-pkgs"
- # no ros-control in ROS2 yet
- if ! ${ROS2}; then
- # TODO(sloretz) Install gazebo-ros-control when it's ported to ROS 2
- ROS_GAZEBO_PKGS="${ROS_GAZEBO_PKGS} \
- ros-${ROS_DISTRO}-gazebo${GAZEBO_VERSION_FOR_ROS}-ros-control"
- fi
- fi
-fi
-
-#
-# DART dependencies
-#
-DART_DEPENDENCIES="libflann-dev \\
- libgtest-dev \\
- libeigen3-dev \\
- libassimp-dev \\
- freeglut3-dev \\
- libxi-dev \\
- libxmu-dev \\
- libtinyxml-dev \\
- libtinyxml2-dev \\
- libfcl-dev \\
- liburdfdom-dev \\
- libboost-system-dev \\
- libboost-filesystem-dev"
-
-if ${DART_COMPILE_FROM_SOURCE}; then
- GAZEBO_EXTRA_DEPENDENCIES="$GAZEBO_EXTRA_DEPENDENCIES \\
- $DART_DEPENDENCIES"
fi
#
diff --git a/jenkins-scripts/tools/detect_cmake_major_version.py b/jenkins-scripts/tools/detect_cmake_major_version.py
index b93ae9ef3..ae68e2844 100644
--- a/jenkins-scripts/tools/detect_cmake_major_version.py
+++ b/jenkins-scripts/tools/detect_cmake_major_version.py
@@ -13,14 +13,11 @@
f.close()
old_version = re.search(r'set *\( *PROJECT_MAJOR_VERSION +(\d+)', txt)
-gazebo_version = re.search(r'set *\( *GAZEBO_MAJOR_VERSION +(\d+)', txt)
sdformat_version = re.search(r'set *\( *SDF_MAJOR_VERSION +(\d+)', txt)
ign_cmake_version = re.search(r'project *\( *ignition-[a-z\-_]+(\d+)', txt)
cmake_project_version = re.search(r'project *\(.*VERSION +(\d+)', txt)
if old_version:
- print(old_version.group(1) )
-elif gazebo_version:
- print(gazebo_version.group(1))
+ print(old_version.group(1))
elif sdformat_version:
print(sdformat_version.group(1))
elif ign_cmake_version:
diff --git a/release.py b/release.py
index a65280db5..c58947982 100755
--- a/release.py
+++ b/release.py
@@ -747,7 +747,7 @@ def create_pr_for_vendor_package(args, repo_path, base_branch) -> str:
if not _out.decode():
return 'vendor tool did not produce any change, avoid the PR'
- branch_name = f'releasepy/{args.version}'
+ branch_name = f'releasepy/{base_branch}/{args.version}'
vendor_repo = get_vendor_repo_url(args.package)
branch_cmd = ['git', "-C", repo_path,
'checkout', '-b', branch_name]