From e6826dbfcbd1427e487b66240a06ed17c0945433 Mon Sep 17 00:00:00 2001
From: Mondo Diaz <armando.m.diaz@boeing.com>
Date: Thu, 15 Jan 2026 20:31:13 +0000
Subject: [PATCH] Fix deploy jobs to only run when dependencies succeed

Change 'when: always' to 'when: on_success' in deploy rules.
'when: always' was overriding the needs behavior, causing deploys
to run even when build_image or other dependencies failed.
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 045e9c1..ba8670f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -256,7 +256,7 @@ deploy_stage:
       agent: esv/bsf/bsf-integration/orchard/orchard-mvp:orchard-stage
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
-      when: always
+      when: on_success
 
 # Deploy feature branch to dev namespace
 deploy_feature:
@@ -295,7 +295,7 @@ deploy_feature:
       agent: esv/bsf/bsf-integration/orchard/orchard-mvp:orchard
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != "main"'
-      when: always
+      when: on_success
 
 # Cleanup feature branch deployment
 cleanup_feature: