From 417b79efe375fbb25c666d15c4214e67f6a4875f Mon Sep 17 00:00:00 2001
From: Andrii Sosiuk <andrii.sosiuk@seco.com>
Date: Tue, 30 Jul 2024 16:43:01 +0200
Subject: [PATCH] YT-230: Fix Manifest Pipeline after "Improve Release" Changes
The recent changes introduced new rules in manifest-pipeline-yocto.yml,
which have overwritten the general rules defined in build-pipeline.yml.
Use !reference to combine both sets of rules effectively.
---
manifest-pipeline-yocto.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 976261a3..270bfc01 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -72,6 +72,7 @@ yocto-pipeline:
- if: '$CI_COMMIT_TAG'
variables:
TEST_STAGE: "auto"
+ - !reference [.build-pipeline, rules]
sdk-pipeline:
extends:
@@ -84,11 +85,12 @@ sdk-pipeline:
ARTIFACTS_PATH: build-*/tmp/deploy/sdk/*
MANUAL_BUILD: "true"
PACKAGE_TYPE: sdk
- rules:
+ rules: !merge
- if: '$CI_COMMIT_TAG'
variables:
MANUAL_BUILD: "false"
DELAY_BUILD: "true"
+ - !reference [.build-pipeline, rules]
fngsystem-pipeline:
extends:
--
GitLab