Skip to content

Commit 740fad9

Browse files
jentingroboquat
jenting
authored and
roboquat
committed
test: disable the PVC integration test
Disable the PVC integration test because we stop proceeding the PVC feature now. Signed-off-by: JenTing Hsiao <[email protected]>
1 parent c8613ce commit 740fad9

File tree

3 files changed

+52
-40
lines changed

3 files changed

+52
-40
lines changed

‎test/tests/components/ws-manager/content_test.go

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,22 @@ func TestBackup(t *testing.T) {
3939
WorkspaceRoot: "/workspace/empty",
4040
CheckoutLocation: "empty",
4141
},
42-
{
43-
Name: "pvc",
44-
ContextURL: "https://github.com/gitpod-io/empty",
45-
WorkspaceRoot: "/workspace/empty",
46-
CheckoutLocation: "empty",
47-
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
48-
},
49-
{
50-
Name: "pvc-non-gitpodified",
51-
ContextURL: "https://github.com/gitpod-io/non-gitpodified-repo",
52-
WorkspaceRoot: "/workspace/non-gitpodified-repo",
53-
CheckoutLocation: "non-gitpodified-repo",
54-
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
55-
},
42+
/*
43+
{
44+
Name: "pvc",
45+
ContextURL: "https://github.com/gitpod-io/empty",
46+
WorkspaceRoot: "/workspace/empty",
47+
CheckoutLocation: "empty",
48+
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
49+
},
50+
{
51+
Name: "pvc-non-gitpodified",
52+
ContextURL: "https://github.com/gitpod-io/non-gitpodified-repo",
53+
WorkspaceRoot: "/workspace/non-gitpodified-repo",
54+
CheckoutLocation: "non-gitpodified-repo",
55+
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
56+
},
57+
*/
5658
}
5759
for _, test := range tests {
5860
t.Run(test.Name, func(t *testing.T) {
@@ -203,6 +205,7 @@ func TestBackup(t *testing.T) {
203205
}
204206

205207
// TestExistingWorkspaceEnablePVC tests enable PVC feature flag on the existing workspace
208+
/*
206209
func TestExistingWorkspaceEnablePVC(t *testing.T) {
207210
f := features.New("backup").
208211
WithLabel("component", "ws-manager").
@@ -356,6 +359,7 @@ func TestExistingWorkspaceEnablePVC(t *testing.T) {
356359
357360
testEnv.Test(t, f)
358361
}
362+
*/
359363

360364
// TestMissingBackup ensures workspaces fail if they should have a backup but don't have one
361365
func TestMissingBackup(t *testing.T) {
@@ -399,7 +403,7 @@ func TestMissingBackup(t *testing.T) {
399403
}{
400404
{Name: "classic"},
401405
{Name: "fwb", FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_FULL_WORKSPACE_BACKUP}},
402-
{Name: "pvc", FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM}},
406+
// {Name: "pvc", FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM}},
403407
}
404408
for _, test := range tests {
405409
t.Run(test.Name+"_backup_init", func(t *testing.T) {

‎test/tests/components/ws-manager/prebuild_test.go

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,18 @@ func TestPrebuildWorkspaceTaskSuccess(t *testing.T) {
5151
{Init: "echo \"some output\" > someFile; sleep 10; exit 0;"},
5252
},
5353
},
54-
{
55-
Name: "pvc",
56-
ContextURL: "https://github.com/gitpod-io/empty",
57-
CheckoutLocation: "empty",
58-
WorkspaceRoot: "/workspace/empty",
59-
Task: []gitpod.TasksItems{
60-
{Init: "echo \"some output\" > someFile; sleep 10; exit 0;"},
54+
/*
55+
{
56+
Name: "pvc",
57+
ContextURL: "https://github.com/gitpod-io/empty",
58+
CheckoutLocation: "empty",
59+
WorkspaceRoot: "/workspace/empty",
60+
Task: []gitpod.TasksItems{
61+
{Init: "echo \"some output\" > someFile; sleep 10; exit 0;"},
62+
},
63+
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
6164
},
62-
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
63-
},
65+
*/
6466
}
6567
for _, test := range tests {
6668
t.Run(test.Name, func(t *testing.T) {
@@ -235,13 +237,15 @@ func TestOpenWorkspaceFromPrebuildSerialOnly(t *testing.T) {
235237
CheckoutLocation: "empty",
236238
WorkspaceRoot: "/workspace/empty",
237239
},
238-
{
239-
Name: "pvc",
240-
ContextURL: "https://github.com/gitpod-io/empty",
241-
CheckoutLocation: "empty",
242-
WorkspaceRoot: "/workspace/empty",
243-
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
244-
},
240+
/*
241+
{
242+
Name: "pvc",
243+
ContextURL: "https://github.com/gitpod-io/empty",
244+
CheckoutLocation: "empty",
245+
WorkspaceRoot: "/workspace/empty",
246+
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
247+
},
248+
*/
245249
}
246250

247251
for _, test := range tests {
@@ -676,6 +680,7 @@ func TestOpenWorkspaceFromOutdatedPrebuild(t *testing.T) {
676680
// - create a prebuild with large workspace class (30Gi disk) separately
677681
// - create the workspace from prebuild with small workspace class (20Gi disk) separately
678682
// - make sure the workspace can't start
683+
/*
679684
func TestPrebuildAndRegularWorkspaceDifferentWorkspaceClass(t *testing.T) {
680685
f := features.New("prebuild").
681686
WithLabel("component", "ws-manager").
@@ -843,6 +848,7 @@ func TestPrebuildAndRegularWorkspaceDifferentWorkspaceClass(t *testing.T) {
843848
844849
testEnv.Test(t, f)
845850
}
851+
*/
846852

847853
// checkSnapshot checks the volume snapshot information is valid or not
848854
func checkSnapshot(t *testing.T, vsInfo *wsmanapi.VolumeSnapshotInfo, isPVCEnable bool) {

‎test/tests/components/ws-manager/tasks_test.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,18 @@ func TestRegularWorkspaceTasks(t *testing.T) {
4040
},
4141
LookForFile: []string{"init-ran", "before-ran", "command-ran"},
4242
},
43-
{
44-
Name: "pvc",
45-
Task: []gitpod.TasksItems{
46-
{Init: fmt.Sprintf("touch %s/init-ran; exit", wsLoc)},
47-
{Before: fmt.Sprintf("touch %s/before-ran; exit", wsLoc)},
48-
{Command: fmt.Sprintf("touch %s/command-ran; exit", wsLoc)},
43+
/*
44+
{
45+
Name: "pvc",
46+
Task: []gitpod.TasksItems{
47+
{Init: fmt.Sprintf("touch %s/init-ran; exit", wsLoc)},
48+
{Before: fmt.Sprintf("touch %s/before-ran; exit", wsLoc)},
49+
{Command: fmt.Sprintf("touch %s/command-ran; exit", wsLoc)},
50+
},
51+
LookForFile: []string{"init-ran", "before-ran", "command-ran"},
52+
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
4953
},
50-
LookForFile: []string{"init-ran", "before-ran", "command-ran"},
51-
FF: []wsmanapi.WorkspaceFeatureFlag{wsmanapi.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM},
52-
},
54+
*/
5355
}
5456

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

0 commit comments

Comments
 (0)