From 8902beeb7d81611caee9a6c416be6b2100b3f6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com>
Date: Tue, 19 Oct 2021 11:32:18 +0200
Subject: [PATCH] Update rules of ddeploy to add manual job

---
 ci-templates/auto-rules/no-default.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index a0d1da0..8e352a0 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -57,29 +57,32 @@ industrial_ci_noetic:
 ddeploy_kinetic:
   extends: .ddeploy
   rules:
-    - if: $DEPLOY && $DEFAULT_DISTRO == "kinetic"
+    - if: $DEPLOY && ($DEFAULT_DISTRO == "kinetic" || $BUILD_KINETIC)
       exists:
         - ddeploy.yaml
-    - if: $DEPLOY && $BUILD_KINETIC
+    - if: $DEFAULT_DISTRO == "kinetic" || $BUILD_KINETIC
       exists:
         - ddeploy.yaml
+      when: manual
 
 ddeploy_melodic:
   extends: .ddeploy
   rules:
-    - if: $DEPLOY && $DEFAULT_DISTRO == "melodic"
+    - if: $DEPLOY && ($DEFAULT_DISTRO == "melodic" || $BUILD_MELODIC)
       exists:
         - ddeploy.yaml
-    - if: $DEPLOY && $BUILD_MELODIC
+    - if: $DEFAULT_DISTRO == "melodic" || $BUILD_MELODIC
       exists:
         - ddeploy.yaml
+      when: manual
 
 ddeploy_noetic:
   extends: .ddeploy
   rules:
-    - if: $DEPLOY && $DEFAULT_DISTRO == "noetic"
+    - if: $DEPLOY && ($DEFAULT_DISTRO == "noetic" || $BUILD_NOETIC)
       exists:
         - ddeploy.yaml
-    - if: $DEPLOY && $BUILD_NOETIC
+    - if: $DEFAULT_DISTRO == "noetic" || $BUILD_NOETIC
       exists:
         - ddeploy.yaml
+      when: manual
-- 
GitLab