From 82c8750ebd062f0a2a79cbb412d2eea85bab5474 Mon Sep 17 00:00:00 2001
From: Sebastian Jahr <sebastian.jahr@franka.de>
Date: Tue, 13 Nov 2018 14:23:27 +0100
Subject: [PATCH] fix Jenkinsfile and Dockerfile
---
.ci/Dockerfile.kinetic | 2 +-
.ci/{Dockerfile.bionic => Dockerfile.melodic} | 0
Jenkinsfile | 14 ++++++++------
3 files changed, 9 insertions(+), 7 deletions(-)
rename .ci/{Dockerfile.bionic => Dockerfile.melodic} (100%)
diff --git a/.ci/Dockerfile.kinetic b/.ci/Dockerfile.kinetic
index 091224f..0129ced 100644
--- a/.ci/Dockerfile.kinetic
+++ b/.ci/Dockerfile.kinetic
@@ -1,4 +1,4 @@
-FROM osrf/ros:melodic-desktop-kinetic
+FROM osrf/ros:kinetic-desktop-xenial
RUN apt-get update && apt-get install -y \
clang-6.0 \
clang-format-6.0 \
diff --git a/.ci/Dockerfile.bionic b/.ci/Dockerfile.melodic
similarity index 100%
rename from .ci/Dockerfile.bionic
rename to .ci/Dockerfile.melodic
diff --git a/Jenkinsfile b/Jenkinsfile
index 5268860..580529e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
#!groovy
-def get_stages(ubuntu_version, ros_distribution){
+def get_stages(ros_distribution){
node('docker') {
step([$class: 'StashNotifier'])
@@ -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",
"ROS_HOME=${env.WORKSPACE}/ros-home"]) {
stage('Build & Lint (Debug)') {
- sh ". /opt/ros/${ros_distribution}/setup.sh"
- sh 'src/franka_ros/.ci/debug.sh'
+ sh """
+ . /opt/ros/${ros_distribution}/setup.sh
+ src/franka_ros/.ci/debug.sh
+ """
junit 'build-debug/test_results/**/*.xml'
}
}
@@ -55,6 +57,6 @@ def get_stages(ubuntu_version, ros_distribution){
parallel(
- 'xenial': get_stages('xenial, kinetic'),
- 'bionic': get_stages('bionic, melodic'),
+ 'kinetic': get_stages('kinetic'),
+ 'melodic': get_stages('melodic'),
)
--
GitLab