Fix PipelineTask timeout not correctly set 💦

Those were missing during in the conversion code. This means any
Pipeline that defines timeout per tasks ends up with the default one
instead of the one set by the user.

Signed-off-by: Vincent Demeester <[email protected]>
(cherry picked from commit 44656a9)

pkg/apis/pipeline/v1alpha1/pipeline_conversion.go

@@ -69,6 +69,7 @@ func (source *PipelineTask) ConvertUp(ctx context.Context, sink *v1beta1.Pipelin
 	sink.Resources = source.Resources
 	sink.Params = source.Params
 	sink.Workspaces = source.Workspaces
+	sink.Timeout = source.Timeout
 	return nil
 }
 
@@ -114,5 +115,6 @@ func (sink *PipelineTask) ConvertDown(ctx context.Context, source v1beta1.Pipeli
 	sink.Resources = source.Resources
 	sink.Params = source.Params
 	sink.Workspaces = source.Workspaces
+	sink.Timeout = source.Timeout
 	return nil
 }

pkg/apis/pipeline/v1alpha1/pipeline_conversion_test.go

@@ -19,6 +19,7 @@ package v1alpha1
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
@@ -100,6 +101,7 @@ func TestPipelineConversion(t *testing.T) {
 						Name:      "w1",
 						Workspace: "workspace1",
 					}},
+					Timeout: &metav1.Duration{Duration: 5 * time.Minute},
 				}, {
 					Name: "task2",
 					TaskSpec: &TaskSpec{TaskSpec: v1beta1.TaskSpec{

test/timeout_test.go

@@ -302,7 +302,7 @@ func TestPipelineTaskTimeout(t *testing.T) {
 
 	t.Logf("Waiting for PipelineRun %s with PipelineTask timeout in namespace %s to fail", pipelineRun.Name, namespace)
 	if err := WaitForPipelineRunState(c, pipelineRun.Name, timeout, FailedWithReason(resources.ReasonFailed, pipelineRun.Name), "PipelineRunTimedOut"); err != nil {
-		t.Errorf("Error waiting for PipelineRun %s to finish: %s", pipelineRun.Name, err)
+		t.Fatalf("Error waiting for PipelineRun %s to finish: %s", pipelineRun.Name, err)
 	}
 
 	t.Logf("Waiting for TaskRun from PipelineRun %s in namespace %s to be timed out", pipelineRun.Name, namespace)