From 5badac14f27a531a28f03c1e84c3dd118e717294 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Thu, 14 Nov 2024 09:59:44 +0100
Subject: [PATCH] Simplify dummy jobs for delete-state job
---
templates/full-pipeline.yml | 6 ++----
templates/validate-plan-destroy.yml | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml
index 686dac1..ae3a72b 100644
--- a/templates/full-pipeline.yml
+++ b/templates/full-pipeline.yml
@@ -310,16 +310,14 @@ include:
'.$[[ inputs.job_name_prefix ]]delete-state:dummy:true':
stage: .pre
script: 'false'
+ rules: [{when: never}]
'.$[[ inputs.job_name_prefix ]]delete-state:dummy:false':
needs: ['$[[ inputs.job_name_prefix ]]destroy']
+ rules: $[[ inputs.delete_state_rules ]]
'$[[ inputs.job_name_prefix ]]delete-state':
extends: '.$[[ inputs.job_name_prefix ]]delete-state:dummy:$[[ inputs.trigger_in_child_pipeline ]]'
- rules:
- - if: '"$[[ inputs.trigger_in_child_pipeline ]]" != "false"'
- when: never
- - $[[ inputs.delete_state_rules ]]
# NOTE: the following configuration is only used if `trigger_in_child_pipeline` is enabled.
diff --git a/templates/validate-plan-destroy.yml b/templates/validate-plan-destroy.yml
index c22650f..e5abfde 100644
--- a/templates/validate-plan-destroy.yml
+++ b/templates/validate-plan-destroy.yml
@@ -249,16 +249,14 @@ include:
'.$[[ inputs.job_name_prefix ]]delete-state:dummy:true':
stage: .pre
script: 'false'
+ rules: [{when: never}]
'.$[[ inputs.job_name_prefix ]]delete-state:dummy:false':
needs: ['$[[ inputs.job_name_prefix ]]destroy']
+ rules: $[[ inputs.delete_state_rules ]]
'$[[ inputs.job_name_prefix ]]delete-state':
extends: '.$[[ inputs.job_name_prefix ]]delete-state:dummy:$[[ inputs.trigger_in_child_pipeline ]]'
- rules:
- - if: '"$[[ inputs.trigger_in_child_pipeline ]]" != "false"'
- when: never
- - $[[ inputs.delete_state_rules ]]
# NOTE: the following configuration is only used if `trigger_in_child_pipeline` is enabled.
--
GitLab