Resolve "Update deprecated deploy job"

Closes #38 (closed)

ci-templates/auto-rules/no-default.yml

@@ -2,32 +2,15 @@ include: ci-templates/core.yml
 
 workflow:
   rules:
-    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/
+    - if: $CI_COMMIT_REF_NAME =~ /^kinetic-.*/
       variables:
         DEFAULT_DISTRO: "kinetic"
-    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+    - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
       variables:
         DEFAULT_DISTRO: "melodic"
-    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+    - if: $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
-
 
 industrial_ci_kinetic:
   extends: .industrial_ci
@@ -53,36 +36,14 @@ industrial_ci_noetic:
     - if: $DEFAULT_DISTRO == "noetic"
     - if: $BUILD_NOETIC
 
-
-ddeploy_kinetic:
-  extends: .ddeploy
-  rules:
-    - if: $DEPLOY && ($DEFAULT_DISTRO == "kinetic" || $BUILD_KINETIC)
-      exists:
-        - ddeploy.yaml
-    - if: $DEFAULT_DISTRO == "kinetic" || $BUILD_KINETIC
-      exists:
-        - ddeploy.yaml
-      when: manual
-
-ddeploy_melodic:
-  extends: .ddeploy
-  rules:
-    - if: $DEPLOY && ($DEFAULT_DISTRO == "melodic" || $BUILD_MELODIC)
-      exists:
-        - ddeploy.yaml
-    - if: $DEFAULT_DISTRO == "melodic" || $BUILD_MELODIC
-      exists:
-        - ddeploy.yaml
-      when: manual
-
-ddeploy_noetic:
+ddeploy:
   extends: .ddeploy
   rules:
-    - if: $DEPLOY && ($DEFAULT_DISTRO == "noetic" || $BUILD_NOETIC)
+    - if: $CI_COMMIT_TAG
       exists:
         - ddeploy.yaml
-    - if: $DEFAULT_DISTRO == "noetic" || $BUILD_NOETIC
-      exists:
+      when: always
+    - exists:
         - ddeploy.yaml
       when: manual
+      allow_failure: true