diff --git a/test/sidecar_test.go b/test/sidecar_test.go index 9fc35467ef0..86d0788e1a8 100644 --- a/test/sidecar_test.go +++ b/test/sidecar_test.go @@ -26,6 +26,7 @@ import ( v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + knativetest "knative.dev/pkg/test" ) const ( @@ -54,6 +55,10 @@ func TestSidecarTaskSupport(t *testing.T) { }} clients, namespace := setup(t) + t.Parallel() + + knativetest.CleanupOnInterrupt(func() { tearDown(t, clients, namespace) }, t.Logf) + defer tearDown(t, clients, namespace) for i, test := range tests { t.Run(test.desc, func(t *testing.T) { @@ -63,10 +68,10 @@ func TestSidecarTaskSupport(t *testing.T) { ObjectMeta: metav1.ObjectMeta{Name: sidecarTaskName, Namespace: namespace}, Spec: v1beta1.TaskSpec{ Steps: []v1beta1.Step{{ - Container: corev1.Container{Name: primaryContainerName, Image: "busybox:1.31.0-musl", Command: test.stepCommand}, + Container: corev1.Container{Name: primaryContainerName, Image: "busybox", Command: test.stepCommand}, }}, Sidecars: []v1beta1.Sidecar{{ - Container: corev1.Container{Name: sidecarContainerName, Image: "busybox:1.31.0-musl", Command: test.sidecarCommand}, + Container: corev1.Container{Name: sidecarContainerName, Image: "busybox", Command: test.sidecarCommand}, }}, }, } diff --git a/test/v1alpha1/sidecar_test.go b/test/v1alpha1/sidecar_test.go index 3fffbc24e6c..3fe5a9e7c07 100644 --- a/test/v1alpha1/sidecar_test.go +++ b/test/v1alpha1/sidecar_test.go @@ -26,6 +26,7 @@ import ( tb "github.com/tektoncd/pipeline/internal/builder/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + knativetest "knative.dev/pkg/test" ) const ( @@ -54,6 +55,10 @@ func TestSidecarTaskSupport(t *testing.T) { }} clients, namespace := setup(t) + t.Parallel() + + knativetest.CleanupOnInterrupt(func() { tearDown(t, clients, namespace) }, t.Logf) + defer tearDown(t, clients, namespace) for i, test := range tests { t.Run(test.desc, func(t *testing.T) { @@ -62,13 +67,13 @@ func TestSidecarTaskSupport(t *testing.T) { task := tb.Task(sidecarTaskName, tb.TaskSpec( tb.Step( - "busybox:1.31.0-musl", + "busybox", tb.StepName(primaryContainerName), tb.StepCommand(test.stepCommand...), ), tb.Sidecar( sidecarContainerName, - "busybox:1.31.0-musl", + "busybox", tb.Command(test.sidecarCommand...), ), ),