Skip to content

Update gpu tests with Vb build number #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
katiewasnothere merged 1 commit into from
Feb 26, 2021
Merged

Update gpu tests with Vb build number #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions test/cri-containerd/container_virtual_device_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
12 changes: 6 additions & 6 deletions test/cri-containerd/runpodsandbox_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand All @@ -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})

Expand All @@ -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})

Expand Down
3 changes: 2 additions & 1 deletion test/functional/uvm_virtualdevice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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()

Expand Down