Resolve "Improve CI template organization"

Closes #35 (closed)

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

@@ -3,6 +3,7 @@ image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
 variables:
   TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
   GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
+  DEFAULT_DISTRO: "kinetic"
 
 services:
   - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
@@ -13,7 +14,30 @@ stages:
 
 workflow:
   rules:
+    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/
+      variables:
+        DEFAULT_DISTRO: "kinetic"
+    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+      variables:
+        DEFAULT_DISTRO: "melodic"
+    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+      variables:
+        DEFAULT_DISTRO: "noetic"
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/
+      variables:
+        DEFAULT_DISTRO: "kinetic"
+        DEPLOY: "true"
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+      variables:
+        DEFAULT_DISTRO: "melodic"
+        DEPLOY: "true"
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+      variables:
+        DEFAULT_DISTRO: "noetic"
+        DEPLOY: "true"
     - if: $CI_COMMIT_TAG
+      variables:
+        DEPLOY: "true"
     - if: $CI_COMMIT_BRANCH
 
 before_script:
@@ -42,13 +66,10 @@ industrial_ci_kinetic:
     ROS_DISTRO: kinetic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
-      when: never
-    - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+    - if: $DEPLOY
       when: never
-    - when: always
+    - if: $DEFAULT_DISTRO == "kinetic"
+    - if: $BUILD_KINETIC
 
 industrial_ci_melodic:
   extends: .industrial_ci
@@ -56,9 +77,11 @@ industrial_ci_melodic:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   rules:
-    - if: $CI_COMMIT_TAG
+  rules:
+    - if: $DEPLOY
       when: never
-    - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+    - if: $DEFAULT_DISTRO == "melodic"
+    - if: $BUILD_MELODIC
 
 industrial_ci_noetic:
   extends: .industrial_ci
@@ -66,15 +89,15 @@ industrial_ci_noetic:
     ROS_DISTRO: noetic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   rules:
-    - if: $CI_COMMIT_TAG
+  rules:
+    - if: $DEPLOY
       when: never
-    - if: $CI_COMMIT_REF_NAME =~ /^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:
@@ -92,6 +115,31 @@ industrial_ci_kinetic_deploy:
     - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
     - cd ..
   rules:
-    - if: $CI_COMMIT_TAG
+    - 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 : '/gitlab_ci/post-check.yml'
+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