From 8727c4fc71c12f9b44c05fcc184546bb0b588daf Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Thu, 21 Oct 2021 10:22:05 +0200
Subject: [PATCH] Redefine rules for auto-rules case
---
ci-templates/auto-rules/no-default.yml | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index 1dd532b..7fd7dd6 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/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
--
GitLab