Make template more generic and add specific instances

.flexbotics-ci-no-rosinstall.yml

+include: 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/.gitlab-industrial-ci.yml'
+
+industrial_ci_kinetic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: kinetic

.flexbotics-ci-with-rosinstall.yml

+include: 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/.gitlab-industrial-ci.yml'
+
+industrial_ci_kinetic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: kinetic
+    UPSTREAM_WORKSPACE: file
+    ROSINSTALL_FILENAME: ".rosinstall"

.gitlab-industrial-ci.yml

@@ -13,9 +13,9 @@ before_script:
   - apk add --update bash coreutils tar wget
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 
-industrial_ci_kinetic:
+.industrial_ci:
   stage: build
   script: .ci_config/gitlab.sh
   variables:
-    ROS_DISTRO: kinetic
-    ROS_PARALLEL_JOBS: "-j1" # keep this for now, since there seems to be memory limit issues in the ci VM
+    ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
+    ROS_PARALLEL_TEST_JOBS: "-j1" # keep this for now, since there seems to be memory limit issues in the ci VM