#1374 Fixing workflow trigger

nemerosa · Jan 6, 2025 · 32784dd · 32784dd
1 parent 0bb64c1
commit 32784dd
Show file tree

Hide file tree

Showing 5 changed files with 599 additions and 94 deletions.
diff --git a/.../src/test/java/net/nemerosa/ontrack/kdsl/acceptance/tests/av/ACCAutoVersioningWorkflow.kt b/.../src/test/java/net/nemerosa/ontrack/kdsl/acceptance/tests/av/ACCAutoVersioningWorkflow.kt
@@ -4,7 +4,6 @@ import net.nemerosa.ontrack.kdsl.acceptance.tests.scm.withMockScmRepository
 import net.nemerosa.ontrack.kdsl.acceptance.tests.support.uid
 import net.nemerosa.ontrack.kdsl.acceptance.tests.support.waitUntil
 import net.nemerosa.ontrack.kdsl.connector.graphql.schema.type.SlotPipelineStatus
-import net.nemerosa.ontrack.kdsl.connector.graphql.schema.type.SlotWorkflowTrigger
 import net.nemerosa.ontrack.kdsl.spec.extension.av.autoVersioning
 import net.nemerosa.ontrack.kdsl.spec.extension.environments.environments
 import net.nemerosa.ontrack.kdsl.spec.extension.environments.workflows.addWorkflow
@@ -42,7 +41,7 @@ class ACCAutoVersioningWorkflow : AbstractACCAutoVersioningTestSupport() {
 
                         // Adding a workflow to this slot
                         slot.addWorkflow(
-                            trigger = SlotWorkflowTrigger.DEPLOYING,
+                            trigger = SlotPipelineStatus.RUNNING,
                             workflowYaml = """
                                 name: Deployment
                                 nodes:
@@ -74,7 +73,7 @@ class ACCAutoVersioningWorkflow : AbstractACCAutoVersioningTestSupport() {
                             timeout = 10_000,
                             interval = 1_000,
                         ) {
-                            ontrack.environments.findPipelineById(pipeline.id)?.status == SlotPipelineStatus.DEPLOYED
+                            ontrack.environments.findPipelineById(pipeline.id)?.status == SlotPipelineStatus.DONE
                         }
 
                         // We expect the GitOps repository to contain the new version

diff --git a/...nemerosa/ontrack/kdsl/acceptance/tests/environments/workflows/ACCEnvironmentsWorkflows.kt b/...nemerosa/ontrack/kdsl/acceptance/tests/environments/workflows/ACCEnvironmentsWorkflows.kt
@@ -4,7 +4,6 @@ import net.nemerosa.ontrack.kdsl.acceptance.tests.AbstractACCDSLTestSupport
 import net.nemerosa.ontrack.kdsl.acceptance.tests.support.uid
 import net.nemerosa.ontrack.kdsl.acceptance.tests.support.waitUntil
 import net.nemerosa.ontrack.kdsl.connector.graphql.schema.type.SlotPipelineStatus
-import net.nemerosa.ontrack.kdsl.connector.graphql.schema.type.SlotWorkflowTrigger
 import net.nemerosa.ontrack.kdsl.spec.extension.environments.environments
 import net.nemerosa.ontrack.kdsl.spec.extension.environments.workflows.addWorkflow
 import org.junit.jupiter.api.Test
@@ -29,7 +28,7 @@ class ACCEnvironmentsWorkflows : AbstractACCDSLTestSupport() {
 
         // Adding a workflow to this slot
         slot.addWorkflow(
-            trigger = SlotWorkflowTrigger.CREATION,
+            trigger = SlotPipelineStatus.CANDIDATE,
             workflowYaml = """
                 name: Creation
                 nodes:
@@ -50,7 +49,7 @@ class ACCEnvironmentsWorkflows : AbstractACCDSLTestSupport() {
             timeout = 10_000,
             interval = 1_000,
         ) {
-            ontrack.environments.findPipelineById(pipeline.id)?.status == SlotPipelineStatus.DEPLOYING
+            ontrack.environments.findPipelineById(pipeline.id)?.status == SlotPipelineStatus.RUNNING
         }
 
     }
@@ -73,7 +72,7 @@ class ACCEnvironmentsWorkflows : AbstractACCDSLTestSupport() {
 
         // Adding a workflow to this slot
         slot.addWorkflow(
-            trigger = SlotWorkflowTrigger.DEPLOYING,
+            trigger = SlotPipelineStatus.RUNNING,
             workflowYaml = """
                 name: Deployment
                 nodes:
@@ -95,7 +94,7 @@ class ACCEnvironmentsWorkflows : AbstractACCDSLTestSupport() {
             timeout = 10_000,
             interval = 1_000,
         ) {
-            ontrack.environments.findPipelineById(pipeline.id)?.status == SlotPipelineStatus.DEPLOYED
+            ontrack.environments.findPipelineById(pipeline.id)?.status == SlotPipelineStatus.DONE
         }
 
     }

diff --git a/...et/nemerosa/ontrack/kdsl/connector/graphql/schema/environments/CreateSlotWorkflow.graphql b/...et/nemerosa/ontrack/kdsl/connector/graphql/schema/environments/CreateSlotWorkflow.graphql
@@ -1,6 +1,6 @@
 mutation CreateSlotWorkflow(
     $slotId: String!,
-    $trigger: SlotWorkflowTrigger!,
+    $trigger: SlotPipelineStatus!,
     $workflowYaml: String!,
 ) {
     addSlotWorkflow(input: {