Skip to content

Gate CRI update container tests behind feature flag #1079

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
dcantah merged 1 commit into from
Jul 20, 2021
Merged

Gate CRI update container tests behind feature flag #1079

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
18 changes: 9 additions & 9 deletions test/cri-containerd/container_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@ func Test_Container_UpdateResources_CPUShare(t *testing.T) {
tests := []config{
{
name: "WCOW_Process",
requiredFeatures: []string{featureWCOWProcess},
requiredFeatures: []string{featureWCOWProcess, featureCRIUpdateContainer},
runtimeHandler: wcowProcessRuntimeHandler,
sandboxImage: imageWindowsNanoserver,
containerImage: imageWindowsNanoserver,
cmd: []string{"cmd", "/c", "ping", "-t", "127.0.0.1"},
},
{
name: "WCOW_Hypervisor",
requiredFeatures: []string{featureWCOWHypervisor},
requiredFeatures: []string{featureWCOWHypervisor, featureCRIUpdateContainer},
runtimeHandler: wcowHypervisorRuntimeHandler,
sandboxImage: imageWindowsNanoserver,
containerImage: imageWindowsNanoserver,
cmd: []string{"cmd", "/c", "ping", "-t", "127.0.0.1"},
},
{
name: "LCOW",
requiredFeatures: []string{featureLCOW},
requiredFeatures: []string{featureLCOW, featureCRIUpdateContainer},
runtimeHandler: lcowRuntimeHandler,
sandboxImage: imageLcowK8sPause,
containerImage: imageLcowAlpine,
Expand Down Expand Up @@ -158,23 +158,23 @@ func Test_Container_UpdateResources_CPUShare_NotRunning(t *testing.T) {
tests := []config{
{
name: "WCOW_Process",
requiredFeatures: []string{featureWCOWProcess},
requiredFeatures: []string{featureWCOWProcess, featureCRIUpdateContainer},
runtimeHandler: wcowProcessRuntimeHandler,
sandboxImage: imageWindowsNanoserver,
containerImage: imageWindowsNanoserver,
cmd: []string{"cmd", "/c", "ping", "-t", "127.0.0.1"},
},
{
name: "WCOW_Hypervisor",
requiredFeatures: []string{featureWCOWHypervisor},
requiredFeatures: []string{featureWCOWHypervisor, featureCRIUpdateContainer},
runtimeHandler: wcowHypervisorRuntimeHandler,
sandboxImage: imageWindowsNanoserver,
containerImage: imageWindowsNanoserver,
cmd: []string{"cmd", "/c", "ping", "-t", "127.0.0.1"},
},
{
name: "LCOW",
requiredFeatures: []string{featureLCOW},
requiredFeatures: []string{featureLCOW, featureCRIUpdateContainer},
runtimeHandler: lcowRuntimeHandler,
sandboxImage: imageLcowK8sPause,
containerImage: imageLcowAlpine,
Expand Down Expand Up @@ -273,23 +273,23 @@ func Test_Container_UpdateResources_Memory(t *testing.T) {
tests := []config{
{
name: "WCOW_Process",
requiredFeatures: []string{featureWCOWProcess},
requiredFeatures: []string{featureWCOWProcess, featureCRIUpdateContainer},
runtimeHandler: wcowProcessRuntimeHandler,
sandboxImage: imageWindowsNanoserver,
containerImage: imageWindowsNanoserver,
cmd: []string{"cmd", "/c", "ping", "-t", "127.0.0.1"},
},
{
name: "WCOW_Hypervisor",
requiredFeatures: []string{featureWCOWHypervisor},
requiredFeatures: []string{featureWCOWHypervisor, featureCRIUpdateContainer},
runtimeHandler: wcowHypervisorRuntimeHandler,
sandboxImage: imageWindowsNanoserver,
containerImage: imageWindowsNanoserver,
cmd: []string{"cmd", "/c", "ping", "-t", "127.0.0.1"},
},
{
name: "LCOW",
requiredFeatures: []string{featureLCOW},
requiredFeatures: []string{featureLCOW, featureCRIUpdateContainer},
runtimeHandler: lcowRuntimeHandler,
sandboxImage: imageLcowK8sPause,
containerImage: imageLcowAlpine,
Expand Down
14 changes: 8 additions & 6 deletions test/cri-containerd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@ var (
// Features
// Make sure you update allFeatures below with any new features you add.
const (
featureLCOW = "LCOW"
featureWCOWProcess = "WCOWProcess"
featureWCOWHypervisor = "WCOWHypervisor"
featureHostProcess = "HostProcess"
featureGMSA = "GMSA"
featureGPU = "GPU"
featureLCOW = "LCOW"
featureWCOWProcess = "WCOWProcess"
featureWCOWHypervisor = "WCOWHypervisor"
featureHostProcess = "HostProcess"
featureGMSA = "GMSA"
featureGPU = "GPU"
featureCRIUpdateContainer = "UpdateContainer"
)

var allFeatures = []string{
Expand All @@ -98,6 +99,7 @@ var allFeatures = []string{
featureHostProcess,
featureGMSA,
featureGPU,
featureCRIUpdateContainer,
}

func init() {
Expand Down