Merge 85618b4 into bd1c1c0

tinkerbell · Jun 15, 2022 · 290fda8 · 290fda8
2 parents bd1c1c0 + 85618b4
commit 290fda8
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 0 deletions.
diff --git a/server/kubernetes_api_test.go b/server/kubernetes_api_test.go
@@ -211,6 +211,73 @@ func TestModifyWorkflowState(t *testing.T) {
 			},
 			wantErr: nil,
 		},
+		{
+			name: "failed task",
+			inputWf: &v1alpha1.Workflow{
+				Status: v1alpha1.WorkflowStatus{
+					State:         "STATE_RUNNING",
+					GlobalTimeout: 600,
+					Tasks: []v1alpha1.Task{
+						{
+							Name:       "provision",
+							WorkerAddr: "machine-mac-1",
+							Actions: []v1alpha1.Action{
+								{
+									Name:      "stream",
+									Image:     "quay.io/tinkerbell-actions/image2disk:v1.0.0",
+									Timeout:   300,
+									Status:    "STATE_RUNNING",
+									StartedAt: TestTime.MetaV1Before(time.Second * 30),
+								},
+								{
+									Name:    "kexec",
+									Image:   "quay.io/tinkerbell-actions/kexec:v1.0.0",
+									Timeout: 5,
+									Status:  "STATE_PENDING",
+								},
+							},
+						},
+					},
+				},
+			},
+			inputWfContext: &workflow.WorkflowContext{
+				CurrentWorker:        "machine-mac-1",
+				CurrentTask:          "provision",
+				CurrentAction:        "stream",
+				CurrentActionIndex:   0,
+				CurrentActionState:   workflow.State_STATE_FAILED,
+				TotalNumberOfActions: 2,
+			},
+			want: &v1alpha1.Workflow{
+				Status: v1alpha1.WorkflowStatus{
+					State:         "STATE_FAILED",
+					GlobalTimeout: 600,
+					Tasks: []v1alpha1.Task{
+						{
+							Name:       "provision",
+							WorkerAddr: "machine-mac-1",
+							Actions: []v1alpha1.Action{
+								{
+									Name:      "stream",
+									Image:     "quay.io/tinkerbell-actions/image2disk:v1.0.0",
+									Timeout:   300,
+									Status:    "STATE_FAILED",
+									StartedAt: TestTime.MetaV1Before(time.Second * 30),
+									Seconds:   30,
+								},
+								{
+									Name:    "kexec",
+									Image:   "quay.io/tinkerbell-actions/kexec:v1.0.0",
+									Timeout: 5,
+									Status:  "STATE_PENDING",
+								},
+							},
+						},
+					},
+				},
+			},
+			wantErr: nil,
+		},
 		{
 			name: "successful task",
 			inputWf: &v1alpha1.Workflow{

diff --git a/server/kubernetes_api_workflow.go b/server/kubernetes_api_workflow.go
@@ -128,6 +128,7 @@ cont:
 			return &t
 		}()
 	case pb.State_STATE_FAILED:
+		fallthrough
 	case pb.State_STATE_TIMEOUT:
 		// Handle terminal statuses by updating the workflow state and time
 		wf.Status.State = v1alpha1.WorkflowState(pb.State_name[int32(wfContext.CurrentActionState)])