From 0bcbc25bf9405477ee8dae836f32e604446d8ab7 Mon Sep 17 00:00:00 2001
From: Felix Mauch <gitlab_w@felix-mauch.de>
Date: Mon, 24 Jun 2019 10:21:32 +0000
Subject: [PATCH] use industrial-ci pipeline

---
 .gitlab-ci.yml | 50 +++++++++++++++-----------------------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b88217a..1d5ae67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,38 +1,18 @@
-image: ros:kinetic-robot
-
-cache:
-  paths:
-    - ccache/
-
+image: docker:git
+services:
+  - docker:dind
 before_script:
- - git clone https://gitlab.com/VictorLamoine/ros_gitlab_ci.git
- - source ros_gitlab_ci/gitlab-ci.bash >/dev/null
+  - apk add --update bash coreutils tar
+  - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci .industrial_ci
 
-# catkin_lint
-catkin lint:
-  tags:
-    - docker
-  stage: build
-  image: ros:kinetic-ros-core
-  before_script:
-    - apt update  >/dev/null 2>&1
-    - apt install -y python-catkin-lint >/dev/null 2>&1
-  script:
-    - catkin_lint -W3 .
-
-# catkin_make
-catkin_make:
-  tags:
-    - docker
-  stage: build
-  script:
-    - catkin_make
-
-catkin_make tests:
-  tags:
-    - docker
-  stage: test
-  script:
-    - catkin_make run_tests
-    - catkin_test_results # Check if one of the tests failed!
+clang-format:
+  variables:
+    CLANG_FORMAT_CHECK: "file"
+    CLANG_FORMAT_VERSION: "6.0"
+    ROS_DISTRO: "kinetic"
+  script: .industrial_ci/gitlab.sh
 
+build_kinetic:
+  variables:
+    ROS_DISTRO: "kinetic"
+  script: .industrial_ci/gitlab.sh