fix: CD Pipeline conditions improvement

patrickmoore-nc · web-flow · commit 910ffcf65b7f · 2025-09-03T11:54:42.000+01:00
diff --git a/.azuredevops/templates/cd-infrastructure-core-common.yaml b/.azuredevops/templates/cd-infrastructure-core-common.yaml
@@ -91,8 +91,8 @@ stages:
     and(
       eq(variables['Build.Reason'], 'Manual'),
       or(
-        in(dependencies.re_tag_stage.result, 'Succeeded', 'Skipped'),
-        eq(dependencies.terraform_deploy.result, 'Succeeded')
+        eq(dependencies.re_tag_stage.result, 'Succeeded'),
+        eq(dependencies.terraform_deploy.jobs.terraform_apply.result, 'Succeeded')
       )
     )
   pool:
@@ -116,9 +116,8 @@ stages:
     and(
       eq(variables['Build.Reason'], 'Manual'),
       or(
-        in(dependencies.re_tag_stage.result, 'Succeeded', 'Skipped'),
-        eq(dependencies.terraform_deploy.result, 'Succeeded'),
-        in(dependencies.db_changes_stage.result, 'Succeeded', 'Skipped')
+        eq(dependencies.re_tag_stage.result, 'Succeeded'),
+        eq(dependencies.terraform_deploy.jobs.terraform_apply.result, 'Succeeded')
       )
     )
   pool:

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ stages:`
`91`	`91`	`and(`
`92`	`92`	`eq(variables['Build.Reason'], 'Manual'),`
`93`	`93`	`or(`
`94`		`- in(dependencies.re_tag_stage.result, 'Succeeded', 'Skipped'),`
`95`		`- eq(dependencies.terraform_deploy.result, 'Succeeded')`
	`94`	`+ eq(dependencies.re_tag_stage.result, 'Succeeded'),`
	`95`	`+ eq(dependencies.terraform_deploy.jobs.terraform_apply.result, 'Succeeded')`
`96`	`96`	`)`
`97`	`97`	`)`
`98`	`98`	`pool:`
`@@ -116,9 +116,8 @@ stages:`
`116`	`116`	`and(`
`117`	`117`	`eq(variables['Build.Reason'], 'Manual'),`
`118`	`118`	`or(`
`119`		`- in(dependencies.re_tag_stage.result, 'Succeeded', 'Skipped'),`
`120`		`- eq(dependencies.terraform_deploy.result, 'Succeeded'),`
`121`		`- in(dependencies.db_changes_stage.result, 'Succeeded', 'Skipped')`
	`119`	`+ eq(dependencies.re_tag_stage.result, 'Succeeded'),`
	`120`	`+ eq(dependencies.terraform_deploy.jobs.terraform_apply.result, 'Succeeded')`
`122`	`121`	`)`
`123`	`122`	`)`
`124`	`123`	`pool:`