From 149e3bd524fb2996971149388e5576ca58f9cef4 Mon Sep 17 00:00:00 2001 From: Hamza El-Saawy Date: Wed, 4 May 2022 20:33:35 -0400 Subject: [PATCH] Only pull appropriate images for testing Signed-off-by: Hamza El-Saawy --- test/cri-containerd/containerdrestart_test.go | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/test/cri-containerd/containerdrestart_test.go b/test/cri-containerd/containerdrestart_test.go index f8676572cf..0e71ec1bc2 100644 --- a/test/cri-containerd/containerdrestart_test.go +++ b/test/cri-containerd/containerdrestart_test.go @@ -74,9 +74,6 @@ func Test_ContainerdRestart_LCOW(t *testing.T) { // test restarting containers and pods func Test_Container_CRI_Restart(t *testing.T) { - pullRequiredImages(t, []string{imageWindowsNanoserver}) - pullRequiredLCOWImages(t, []string{imageLcowK8sPause, imageLcowAlpine}) - client := newTestRuntimeClient(t) pluginClient := newTestPluginClient(t) ctx, cancel := context.WithCancel(context.Background()) @@ -143,6 +140,13 @@ func Test_Container_CRI_Restart(t *testing.T) { t.Run(tt.Name+suffix, func(t *testing.T) { requireFeatures(t, tt.Feature) + switch tt.Feature { + case featureLCOW: + pullRequiredLCOWImages(t, append([]string{imageLcowK8sPause}, tt.Image)) + case featureWCOWHypervisor, featureWCOWProcess: + pullRequiredImages(t, []string{tt.Image}) + } + opts := tt.SandboxOpts if !explicit { opts = append(tt.SandboxOpts, @@ -215,9 +219,6 @@ func Test_Container_CRI_Restart(t *testing.T) { func Test_Container_CRI_Restart_State(t *testing.T) { testFile := "t.txt" - pullRequiredImages(t, []string{imageWindowsNanoserver}) - pullRequiredLCOWImages(t, []string{imageLcowK8sPause, imageLcowAlpine}) - client := newTestRuntimeClient(t) ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -281,6 +282,13 @@ func Test_Container_CRI_Restart_State(t *testing.T) { requireFeatures(t, featureTerminateOnRestart) } + switch tt.Feature { + case featureLCOW: + pullRequiredLCOWImages(t, append([]string{imageLcowK8sPause}, tt.Image)) + case featureWCOWHypervisor, featureWCOWProcess: + pullRequiredImages(t, []string{tt.Image}) + } + sandboxRequest := getRunPodSandboxRequest(t, tt.Runtime, append(tt.SandboxOpts, WithSandboxAnnotations(map[string]string{