Skip to content

Commit 2523e66

Browse files
jsturtevantritazh
authored andcommitted
Enable tests than can now run on GH actions
Signed-off-by: James Sturtevant <[email protected]>
1 parent 0e83a68 commit 2523e66

File tree

7 files changed

+6
-29
lines changed

7 files changed

+6
-29
lines changed

.github/workflows/windows.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
go build -v -a -o ./bin/csi-proxy-api-gen.exe ./cmd/csi-proxy-api-gen
2121
- name: Run Windows Integration Tests
2222
run: |
23+
# required for running Volume and Disk tests
24+
Install-WindowsFeature -name Hyper-V-PowerShell
25+
2326
# start the CSI Proxy before running tests on windows
2427
Start-Job -Name CSIProxy -ScriptBlock {
2528
.\bin\csi-proxy.exe
@@ -28,7 +31,7 @@ jobs:
2831
Write-Output "getting named pipes"
2932
[System.IO.Directory]::GetFiles("\\.\\pipe\\")
3033
$env:CSI_PROXY_GH_ACTIONS="TRUE"
31-
go test -v -race ./integrationtests/...
34+
go test -timeout 20m -v -race ./integrationtests/...
3235
unit_tests:
3336
strategy:
3437
matrix:

integrationtests/disk_v1_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ func v1DiskTests(t *testing.T) {
7777
})
7878

7979
t.Run("Get/SetDiskState", func(t *testing.T) {
80-
skipTestOnCondition(t, isRunningOnGhActions())
81-
8280
client, err := diskv1client.NewClient()
8381
require.NoError(t, err)
8482

@@ -144,8 +142,6 @@ func v1DiskTests(t *testing.T) {
144142
})
145143

146144
t.Run("PartitionDisk", func(t *testing.T) {
147-
skipTestOnCondition(t, isRunningOnGhActions())
148-
149145
var err error
150146
client, err := diskv1client.NewClient()
151147
require.NoError(t, err)

integrationtests/disk_v1alpha1_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ func v1alpha1DiskTests(t *testing.T) {
3434
})
3535

3636
t.Run("Rescan", func(t *testing.T) {
37-
skipTestOnCondition(t, isRunningOnGhActions())
38-
3937
client, err := diskv1alpha1client.NewClient()
4038
require.NoError(t, err)
4139

@@ -47,8 +45,6 @@ func v1alpha1DiskTests(t *testing.T) {
4745
})
4846

4947
t.Run("PartitionDisk", func(t *testing.T) {
50-
skipTestOnCondition(t, isRunningOnGhActions())
51-
5248
var err error
5349
client, err := diskv1alpha1client.NewClient()
5450
require.NoError(t, err)

integrationtests/disk_v1beta1_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ func v1beta1DiskTests(t *testing.T) {
5757
})
5858

5959
t.Run("Get/SetDiskState", func(t *testing.T) {
60-
skipTestOnCondition(t, isRunningOnGhActions())
61-
6260
client, err := diskv1beta1client.NewClient()
6361
require.NoError(t, err)
6462

@@ -86,8 +84,6 @@ func v1beta1DiskTests(t *testing.T) {
8684
})
8785

8886
t.Run("PartitionDisk", func(t *testing.T) {
89-
skipTestOnCondition(t, isRunningOnGhActions())
90-
9187
var err error
9288
client, err := diskv1beta1client.NewClient()
9389
require.NoError(t, err)

integrationtests/disk_v1beta2_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ func v1beta2DiskTests(t *testing.T) {
5858
})
5959

6060
t.Run("Get/SetDiskState", func(t *testing.T) {
61-
skipTestOnCondition(t, isRunningOnGhActions())
62-
6361
client, err := diskv1beta2client.NewClient()
6462
require.NoError(t, err)
6563

@@ -127,8 +125,6 @@ func v1beta2DiskTests(t *testing.T) {
127125
})
128126

129127
t.Run("PartitionDisk", func(t *testing.T) {
130-
skipTestOnCondition(t, isRunningOnGhActions())
131-
132128
var err error
133129
client, err := diskv1beta2client.NewClient()
134130
require.NoError(t, err)

integrationtests/disk_v1beta3_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ func v1beta3DiskTests(t *testing.T) {
7777
})
7878

7979
t.Run("Get/SetDiskState", func(t *testing.T) {
80-
skipTestOnCondition(t, isRunningOnGhActions())
81-
8280
client, err := diskv1beta3client.NewClient()
8381
require.NoError(t, err)
8482

@@ -144,8 +142,6 @@ func v1beta3DiskTests(t *testing.T) {
144142
})
145143

146144
t.Run("PartitionDisk", func(t *testing.T) {
147-
skipTestOnCondition(t, isRunningOnGhActions())
148-
149145
var err error
150146
client, err := diskv1beta3client.NewClient()
151147
require.NoError(t, err)

integrationtests/volume_test.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,32 +148,26 @@ func TestVolumeAPIs(t *testing.T) {
148148
negativeVolumeTests(t)
149149
})
150150

151-
// TODO: These tests will fail on Github Actions because Hyper-V is disabled
152-
// see https://github.com/actions/virtual-environments/pull/2525
151+
// Github Actions WS 2022 supports hyper-v
152+
// must install management tools manually
153153

154154
// these tests should be considered frozen from the API point of view
155155
t.Run("v1alpha1Tests", func(t *testing.T) {
156-
skipTestOnCondition(t, isRunningOnGhActions())
157156
v1alpha1VolumeTests(t)
158157
})
159158
t.Run("v1beta1Tests", func(t *testing.T) {
160-
skipTestOnCondition(t, isRunningOnGhActions())
161159
v1beta1VolumeTests(t)
162160
})
163161
t.Run("v1beta2Tests", func(t *testing.T) {
164-
skipTestOnCondition(t, isRunningOnGhActions())
165162
v1beta2VolumeTests(t)
166163
})
167164
t.Run("v1beta3Tests", func(t *testing.T) {
168-
skipTestOnCondition(t, isRunningOnGhActions())
169165
v1beta3VolumeTests(t)
170166
})
171167
t.Run("v1Tests", func(t *testing.T) {
172-
skipTestOnCondition(t, isRunningOnGhActions())
173168
v1VolumeTests(t)
174169
})
175170
t.Run("v2alpha1Tests", func(t *testing.T) {
176-
skipTestOnCondition(t, isRunningOnGhActions())
177171
v2alpha1VolumeTests(t)
178172
})
179173
}

0 commit comments

Comments
 (0)