Skip to content
Snippets Groups Projects
Commit 82c8750e authored by Sebastian Jahr's avatar Sebastian Jahr
Browse files

fix Jenkinsfile and Dockerfile

parent c9fea19e
No related branches found
No related tags found
No related merge requests found
FROM osrf/ros:melodic-desktop-kinetic FROM osrf/ros:kinetic-desktop-xenial
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
clang-6.0 \ clang-6.0 \
clang-format-6.0 \ clang-format-6.0 \
......
File moved
#!groovy #!groovy
def get_stages(ubuntu_version, ros_distribution){ def get_stages(ros_distribution){
node('docker') { node('docker') {
step([$class: 'StashNotifier']) step([$class: 'StashNotifier'])
...@@ -31,12 +31,14 @@ def get_stages(ubuntu_version, ros_distribution){ ...@@ -31,12 +31,14 @@ def get_stages(ubuntu_version, ros_distribution){
''' '''
} }
docker.build("franka_ros-ci-worker:${ubuntu_version}", "-f src/franka_ros/.ci/Dockerfile.${ubuntu_version} .ci").inside { docker.build("franka_ros-ci-worker:${ros_distribution}", "-f src/franka_ros/.ci/Dockerfile.${ros_distribution} src/franka_ros/.ci").inside {
withEnv(["CMAKE_PREFIX_PATH+=${env.WORKSPACE}/dist/libfranka/lib/cmake/Franka", withEnv(["CMAKE_PREFIX_PATH+=${env.WORKSPACE}/dist/libfranka/lib/cmake/Franka",
"ROS_HOME=${env.WORKSPACE}/ros-home"]) { "ROS_HOME=${env.WORKSPACE}/ros-home"]) {
stage('Build & Lint (Debug)') { stage('Build & Lint (Debug)') {
sh ". /opt/ros/${ros_distribution}/setup.sh" sh """
sh 'src/franka_ros/.ci/debug.sh' . /opt/ros/${ros_distribution}/setup.sh
src/franka_ros/.ci/debug.sh
"""
junit 'build-debug/test_results/**/*.xml' junit 'build-debug/test_results/**/*.xml'
} }
} }
...@@ -55,6 +57,6 @@ def get_stages(ubuntu_version, ros_distribution){ ...@@ -55,6 +57,6 @@ def get_stages(ubuntu_version, ros_distribution){
parallel( parallel(
'xenial': get_stages('xenial, kinetic'), 'kinetic': get_stages('kinetic'),
'bionic': get_stages('bionic, melodic'), 'melodic': get_stages('melodic'),
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment