Merge branch 'add-melodic-ci-job' into 'master'

Add melodic ci job

See merge request tecnalia_robotics-public/gitlab_templates!34

.gitlab-industrial-ci-kinetic-no-rosinstall.yml

@@ -38,6 +38,18 @@ industrial_ci_kinetic:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
+    - melodic-devel
+
+industrial_ci_melodic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: melodic
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+  only:
+    - melodic-devel
+  except:
+    - tags
+  allow_failure: yes
 
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci

.gitlab-industrial-ci-kinetic-with-rosinstall.yml

@@ -40,6 +40,18 @@ industrial_ci_kinetic:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
+    - melodic-devel
+
+industrial_ci_melodic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: melodic
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+  only:
+    - melodic-devel
+  except:
+    - tags
+  allow_failure: yes
 
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci