Skip to content
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

test: disable the PVC integration test #14838

Merged
merged 1 commit into from
Nov 22, 2022
+52 −40
Merged

test: disable the PVC integration test #14838

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
34 changes: 19 additions & 15 deletions test/tests/components/ws-manager/content_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,22 @@ func TestBackup(t *testing.T) {
WorkspaceRoot: "/workspace/empty",
CheckoutLocation: "empty",
},
{
Name: "pvc",
ContextURL: "https://github.com/gitpod-io/empty",
WorkspaceRoot: "/workspace/empty",
CheckoutLocation: "empty",
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
{
Name: "pvc-non-gitpodified",
ContextURL: "https://github.com/gitpod-io/non-gitpodified-repo",
WorkspaceRoot: "/workspace/non-gitpodified-repo",
CheckoutLocation: "non-gitpodified-repo",
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
/*
{
Name: "pvc",
ContextURL: "https://github.com/gitpod-io/empty",
WorkspaceRoot: "/workspace/empty",
CheckoutLocation: "empty",
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
{
Name: "pvc-non-gitpodified",
ContextURL: "https://github.com/gitpod-io/non-gitpodified-repo",
WorkspaceRoot: "/workspace/non-gitpodified-repo",
CheckoutLocation: "non-gitpodified-repo",
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
*/
}
for _, test := range tests {
t.Run(test.Name, func(t *testing.T) {
Expand Down Expand Up @@ -203,6 +205,7 @@ func TestBackup(t *testing.T) {
}

// TestExistingWorkspaceEnablePVC tests enable PVC feature flag on the existing workspace
/*
func TestExistingWorkspaceEnablePVC(t *testing.T) {
f := features.New("backup").
WithLabel("component", "ws-manager").
Expand Down Expand Up @@ -356,6 +359,7 @@ func TestExistingWorkspaceEnablePVC(t *testing.T) {

testEnv.Test(t, f)
}
*/

// TestMissingBackup ensures workspaces fail if they should have a backup but don't have one
func TestMissingBackup(t *testing.T) {
Expand Down Expand Up @@ -399,7 +403,7 @@ func TestMissingBackup(t *testing.T) {
}{
{Name: "classic"},
{Name: "fwb", FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_FULL_WORKSPACE_BACKUP}},
{Name: "pvc", FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM}},
// {Name: "pvc", FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM}},
}
for _, test := range tests {
t.Run(test.Name+"_backup_init", func(t *testing.T) {
Expand Down
38 changes: 22 additions & 16 deletions test/tests/components/ws-manager/prebuild_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,18 @@ func TestPrebuildWorkspaceTaskSuccess(t *testing.T) {
{Init: "echo \"some output\" > someFile; sleep 10; exit 0;"},
},
},
{
Name: "pvc",
ContextURL: "https://github.com/gitpod-io/empty",
CheckoutLocation: "empty",
WorkspaceRoot: "/workspace/empty",
Task: []gitpod.TasksItems{
{Init: "echo \"some output\" > someFile; sleep 10; exit 0;"},
/*
{
Name: "pvc",
ContextURL: "https://github.com/gitpod-io/empty",
CheckoutLocation: "empty",
WorkspaceRoot: "/workspace/empty",
Task: []gitpod.TasksItems{
{Init: "echo \"some output\" > someFile; sleep 10; exit 0;"},
},
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
*/
}
for _, test := range tests {
t.Run(test.Name, func(t *testing.T) {
Expand Down Expand Up @@ -235,13 +237,15 @@ func TestOpenWorkspaceFromPrebuildSerialOnly(t *testing.T) {
CheckoutLocation: "empty",
WorkspaceRoot: "/workspace/empty",
},
{
Name: "pvc",
ContextURL: "https://github.com/gitpod-io/empty",
CheckoutLocation: "empty",
WorkspaceRoot: "/workspace/empty",
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
/*
{
Name: "pvc",
ContextURL: "https://github.com/gitpod-io/empty",
CheckoutLocation: "empty",
WorkspaceRoot: "/workspace/empty",
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
*/
}

for _, test := range tests {
Expand Down Expand Up @@ -676,6 +680,7 @@ func TestOpenWorkspaceFromOutdatedPrebuild(t *testing.T) {
// - create a prebuild with large workspace class (30Gi disk) separately
// - create the workspace from prebuild with small workspace class (20Gi disk) separately
// - make sure the workspace can't start
/*
func TestPrebuildAndRegularWorkspaceDifferentWorkspaceClass(t *testing.T) {
f := features.New("prebuild").
WithLabel("component", "ws-manager").
Expand Down Expand Up @@ -843,6 +848,7 @@ func TestPrebuildAndRegularWorkspaceDifferentWorkspaceClass(t *testing.T) {

testEnv.Test(t, f)
}
*/

// checkSnapshot checks the volume snapshot information is valid or not
func checkSnapshot(t *testing.T, vsInfo *wsmanapi.VolumeSnapshotInfo, isPVCEnable bool) {
Expand Down
20 changes: 11 additions & 9 deletions test/tests/components/ws-manager/tasks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,18 @@ func TestRegularWorkspaceTasks(t *testing.T) {
},
LookForFile: []string{"init-ran", "before-ran", "command-ran"},
},
{
Name: "pvc",
Task: []gitpod.TasksItems{
{Init: fmt.Sprintf("touch %s/init-ran; exit", wsLoc)},
{Before: fmt.Sprintf("touch %s/before-ran; exit", wsLoc)},
{Command: fmt.Sprintf("touch %s/command-ran; exit", wsLoc)},
/*
{
Name: "pvc",
Task: []gitpod.TasksItems{
{Init: fmt.Sprintf("touch %s/init-ran; exit", wsLoc)},
{Before: fmt.Sprintf("touch %s/before-ran; exit", wsLoc)},
{Command: fmt.Sprintf("touch %s/command-ran; exit", wsLoc)},
},
LookForFile: []string{"init-ran", "before-ran", "command-ran"},
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
LookForFile: []string{"init-ran", "before-ran", "command-ran"},
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
},
*/
}

f := features.New("ws-manager").
Expand Down