Resolve "Improve CI template organization"

Closes #35 (closed)

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

@@ -95,11 +95,9 @@ industrial_ci_noetic:
     - if: $DEFAULT_DISTRO == "noetic"
     - if: $BUILD_NOETIC
 
-industrial_ci_kinetic_deploy:
+.industrial_ci_deploy:
   extends: .industrial_ci
   variables:
-    ROS_DISTRO: kinetic
-    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
     AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash"
     DOCKER_COMMIT: industrial_ci_image
   script:
@@ -119,4 +117,29 @@ industrial_ci_kinetic_deploy:
   rules:
     - if: $DEPLOY
 
+
+industrial_kinetic_deploy:
+  extends:
+    - industrial_ci_kinetic
+    - .industrial_ci_deploy
+  rules:
+    - if: $DEPLOY && $DEFAULT_DISTRO == "kinetic"
+    - if: $DEPLOY && $BUILD_KINETIC
+
+industrial_melodic_deploy:
+  extends:
+    - industrial_ci_melodic
+    - .industrial_ci_deploy
+  rules:
+    - if: $DEPLOY && $DEFAULT_DISTRO == "melodic"
+    - if: $DEPLOY && $BUILD_MELODIC
+
+industrial_noetic_deploy:
+  extends:
+    - industrial_ci_noetic
+    - .industrial_ci_deploy
+  rules:
+    - if: $DEPLOY && $DEFAULT_DISTRO == "noetic"
+    - if: $DEPLOY && $BUILD_NOETIC
+
 include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/gitlab-ci/post-check.yml'
\ No newline at end of file