From ff292d8a34b0ae63d1751e60ec73525847de03ff Mon Sep 17 00:00:00 2001
From: Thore Goll <thore.goll@franka.de>
Date: Mon, 27 Sep 2021 09:43:41 +0200
Subject: [PATCH] CHANGE: Drop Kinetic Support

---
 .ci/Dockerfile.kinetic   | 15 ---------------
 .github/workflows/ci.yml |  3 +--
 CHANGELOG.md             |  1 +
 Jenkinsfile              |  1 -
 4 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 .ci/Dockerfile.kinetic

diff --git a/.ci/Dockerfile.kinetic b/.ci/Dockerfile.kinetic
deleted file mode 100644
index c8c33f04..00000000
--- a/.ci/Dockerfile.kinetic
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM osrf/ros:kinetic-desktop-xenial
-RUN apt-get update -y && apt-get install -y --allow-unauthenticated \
-    clang-6.0 \
-    clang-format-6.0 \
-    clang-tidy-6.0 \
-    python3-pip \
-    ros-kinetic-libfranka \
-    ros-kinetic-ros-control \
-    ros-kinetic-eigen-conversions \
-    ros-kinetic-gazebo-dev \
-    ros-kinetic-gazebo-ros-control \
-    ros-kinetic-orocos-kdl \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN pip3 install -U catkin_tools
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30d46e6e..04136ee1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,6 @@ on:
 
   pull_request:
     branches:
-    - kinetic-devel
     - melodic-devel
     - noetic-devel
     - develop
@@ -17,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ros_distro: [ kinetic, melodic, noetic ]
+        ros_distro: [ melodic, noetic ]
     steps:
     - name: Prepare
       # Keep the compilation outputs persitant outside the docker container to use for the other steps
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8de4e2f..158d88e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 0.x - UNRELEASED
 
 * Add `joint_state_desired` publisher to `franka_gazebo`
+* No further ROS Kinetic support, since [End-of-Life was in April 2021](http://wiki.ros.org/Distributions)
 
 ## 0.8.1 - 2021-09-08
 
diff --git a/Jenkinsfile b/Jenkinsfile
index a8cc2489..4023ce71 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,6 @@ node {
 }
 
 parallel(
-  'kinetic': getStages('kinetic', 'xenial'),
   'melodic': getStages('melodic', 'bionic'),
   'noetic': getStages('noetic', 'focal'),
 )