From 1f8111fd18598a470bea9870b76283ac9c6a5f63 Mon Sep 17 00:00:00 2001 From: Kathryn Baldauf Date: Thu, 25 Feb 2021 11:03:54 -0800 Subject: [PATCH] Update gpu tests with Vb build number Signed-off-by: Kathryn Baldauf --- .../container_virtual_device_test.go | 32 +++++++++---------- test/cri-containerd/runpodsandbox_test.go | 12 +++---- test/functional/uvm_virtualdevice_test.go | 3 +- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/test/cri-containerd/container_virtual_device_test.go b/test/cri-containerd/container_virtual_device_test.go index 747da4d4c3..e5762642aa 100644 --- a/test/cri-containerd/container_virtual_device_test.go +++ b/test/cri-containerd/container_virtual_device_test.go @@ -200,8 +200,8 @@ func getGPUContainerRequestWCOW(t *testing.T, podID string, podConfig *runtime.P func Test_RunContainer_VirtualDevice_GPU_LCOW(t *testing.T) { requireFeatures(t, featureLCOW, featureGPU) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } testDeviceInstanceID, err := findTestNvidiaGPUDevice() @@ -240,8 +240,8 @@ func Test_RunContainer_VirtualDevice_GPU_LCOW(t *testing.T) { func Test_RunContainer_VirtualDevice_GPU_Multiple_LCOW(t *testing.T) { requireFeatures(t, featureLCOW, featureGPU) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } numContainers := 2 @@ -289,8 +289,8 @@ func Test_RunContainer_VirtualDevice_GPU_Multiple_LCOW(t *testing.T) { func Test_RunContainer_VirtualDevice_GPU_and_NoGPU_LCOW(t *testing.T) { requireFeatures(t, featureLCOW, featureGPU) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } testDeviceInstanceID, err := findTestNvidiaGPUDevice() @@ -358,8 +358,8 @@ func Test_RunContainer_VirtualDevice_GPU_and_NoGPU_LCOW(t *testing.T) { func Test_RunContainer_VirtualDevice_GPU_Multiple_Removal_LCOW(t *testing.T) { requireFeatures(t, featureLCOW, featureGPU) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } testDeviceInstanceID, err := findTestNvidiaGPUDevice() @@ -486,8 +486,8 @@ func Test_RunContainer_VirtualDevice_ClassGUID_WCOW_Process(t *testing.T) { func Test_RunContainer_VirtualDevice_GPU_WCOW_Hypervisor(t *testing.T) { requireFeatures(t, featureWCOWHypervisor, featureGPU) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } testDeviceInstanceID, err := findTestNvidiaGPUDevice() @@ -531,8 +531,8 @@ func Test_RunContainer_VirtualDevice_GPU_WCOW_Hypervisor(t *testing.T) { func Test_RunContainer_VirtualDevice_GPU_and_NoGPU_WCOW_Hypervisor(t *testing.T) { requireFeatures(t, featureWCOWHypervisor, featureGPU) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } testDeviceInstanceID, err := findTestNvidiaGPUDevice() @@ -592,8 +592,8 @@ func Test_RunContainer_VirtualDevice_GPU_and_NoGPU_WCOW_Hypervisor(t *testing.T) func Test_RunContainer_VirtualDevice_GPU_Multiple_WCOW_Hypervisor(t *testing.T) { requireFeatures(t, featureWCOWHypervisor, featureGPU) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } numContainers := 2 @@ -645,8 +645,8 @@ func Test_RunContainer_VirtualDevice_GPU_Multiple_WCOW_Hypervisor(t *testing.T) func Test_RunContainer_VirtualDevice_GPU_Multiple_Removal_WCOW_Hypervisor(t *testing.T) { requireFeatures(t, featureWCOWHypervisor, featureGPU) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } testDeviceInstanceID, err := findTestNvidiaGPUDevice() diff --git a/test/cri-containerd/runpodsandbox_test.go b/test/cri-containerd/runpodsandbox_test.go index 41aa2f1296..6ba364bead 100644 --- a/test/cri-containerd/runpodsandbox_test.go +++ b/test/cri-containerd/runpodsandbox_test.go @@ -260,8 +260,8 @@ func Test_RunPodSandbox_MemorySize_LCOW(t *testing.T) { func Test_RunPodSandbox_MMIO_WCOW_Process(t *testing.T) { requireFeatures(t, featureWCOWProcess) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } pullRequiredImages(t, []string{imageWindowsNanoserver}) @@ -277,8 +277,8 @@ func Test_RunPodSandbox_MMIO_WCOW_Process(t *testing.T) { func Test_RunPodSandbox_MMIO_WCOW_Hypervisor(t *testing.T) { requireFeatures(t, featureWCOWHypervisor) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } pullRequiredImages(t, []string{imageWindowsNanoserver}) @@ -294,8 +294,8 @@ func Test_RunPodSandbox_MMIO_WCOW_Hypervisor(t *testing.T) { func Test_RunPodSandbox_MMIO_LCOW(t *testing.T) { requireFeatures(t, featureLCOW) - if osversion.Get().Build < 19566 { - t.Skip("Requires build +19566") + if osversion.Get().Build < osversion.V20H1 { + t.Skip("Requires build +20H1") } pullRequiredLcowImages(t, []string{imageLcowK8sPause}) diff --git a/test/functional/uvm_virtualdevice_test.go b/test/functional/uvm_virtualdevice_test.go index ac30e2d89f..91762ac059 100644 --- a/test/functional/uvm_virtualdevice_test.go +++ b/test/functional/uvm_virtualdevice_test.go @@ -10,6 +10,7 @@ import ( "time" "github.com/Microsoft/hcsshim/internal/uvm" + "github.com/Microsoft/hcsshim/osversion" testutilities "github.com/Microsoft/hcsshim/test/functional/utilities" ) @@ -28,7 +29,7 @@ func findTestVirtualDevice() (string, error) { } func TestVirtualDevice(t *testing.T) { - testutilities.RequiresBuild(t, 19566) + testutilities.RequiresBuild(t, osversion.V20H1) ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second) defer cancel()