Redefine rules for auto-rules case

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

@@ -54,28 +54,14 @@ industrial_ci_noetic:
     - if: $BUILD_NOETIC
 
 
-ddeploy_kinetic:
+ddeploy:
   extends: .ddeploy
   rules:
-    - if: $DEPLOY && ($DEFAULT_DISTRO == "kinetic" || $BUILD_KINETIC)
+    - if: $DEPLOY && $CI_COMMIT_TAG
       exists:
         - ddeploy.yaml
-      when: manual
-      allow_failure: true
-
-ddeploy_melodic:
-  extends: .ddeploy
-  rules:
-    - if: $DEPLOY && ($DEFAULT_DISTRO == "melodic" || $BUILD_MELODIC)
-      exists:
-        - ddeploy.yaml
-      when: manual
-      allow_failure: true
-
-ddeploy_noetic:
-  extends: .ddeploy
-  rules:
-    - if: $DEPLOY && ($DEFAULT_DISTRO == "noetic" || $BUILD_NOETIC)
+      when: always
+    - if: $DEPLOY
       exists:
         - ddeploy.yaml
       when: manual