Skip to content

Commit eab54f0

Browse files
Mia-CrossMia-Cross
authored
fix(compute): fix nightly tests (scaleway#3105)
* fix k8s * instance: skip tests with bssd volumes/snapshots + remove cassettes * nit block: align testfixture with other resources
1 parent 7bedecc commit eab54f0

25 files changed

+2383
-37817
lines changed

‎internal/services/block/snapshot_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestAccSnapshot_FromS3(t *testing.T) {
6565
resource "scaleway_object" "qcow-object" {
6666
bucket = scaleway_object_bucket.snapshot-bucket.name
6767
key = "test-acc-block-snapshot.qcow2"
68-
file = "testfixtures/small_image.qcow2"
68+
file = "testfixture/small_image.qcow2"
6969
}
7070
7171
resource "scaleway_block_snapshot" "qcow-block-snapshot" {

‎internal/services/block/testfixtures/small_image.qcow2‎ renamed to ‎internal/services/block/testfixture/small_image.qcow2‎

File renamed without changes.

‎internal/services/instance/image_test.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ import (
1515
)
1616

1717
func TestAccImage_BlockVolume(t *testing.T) {
18+
t.Skip("Resources \"scaleway_instance_volume\" and \"scaleway_instance_snapshot\" are depracated")
19+
// TestAccImage_ExternalBlockVolume should suffice to test the same logic with scaleway_block_volumes
20+
1821
tt := acctest.NewTestTools(t)
1922
defer tt.Cleanup()
2023
resource.ParallelTest(t, resource.TestCase{
@@ -213,7 +216,7 @@ func TestAccImage_Server(t *testing.T) {
213216
ProviderFactories: tt.ProviderFactories,
214217
CheckDestroy: resource.ComposeTestCheckFunc(
215218
isImageDestroyed(tt),
216-
isSnapshotDestroyed(tt),
219+
blocktestfuncs.IsSnapshotDestroyed(tt),
217220
instancechecks.IsServerDestroyed(tt),
218221
),
219222
Steps: []resource.TestStep{
@@ -278,6 +281,9 @@ func TestAccImage_Server(t *testing.T) {
278281
}
279282

280283
func TestAccImage_ServerWithBlockVolume(t *testing.T) {
284+
t.Skip("Resources \"scaleway_instance_volume\" and \"scaleway_instance_snapshot\" are depracated")
285+
// TestAccImage_ServerWithSBSVolume should suffice to test the same logic with block volumes
286+
281287
tt := acctest.NewTestTools(t)
282288
defer tt.Cleanup()
283289
resource.ParallelTest(t, resource.TestCase{

‎internal/services/instance/server_test.go‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ func TestAccServer_RootVolume_Boot(t *testing.T) {
245245
}
246246

247247
func TestAccServer_RootVolume_ID(t *testing.T) {
248+
t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
249+
248250
tt := acctest.NewTestTools(t)
249251
defer tt.Cleanup()
250252
resource.ParallelTest(t, resource.TestCase{
@@ -545,6 +547,8 @@ EOF
545547
}
546548

547549
func TestAccServer_AdditionalVolumes(t *testing.T) {
550+
t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
551+
548552
tt := acctest.NewTestTools(t)
549553
defer tt.Cleanup()
550554
resource.ParallelTest(t, resource.TestCase{
@@ -621,6 +625,8 @@ func TestAccServer_AdditionalVolumes(t *testing.T) {
621625
}
622626

623627
func TestAccServer_AdditionalVolumesDetach(t *testing.T) {
628+
t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
629+
624630
tt := acctest.NewTestTools(t)
625631
defer tt.Cleanup()
626632
resource.ParallelTest(t, resource.TestCase{
@@ -1009,6 +1015,8 @@ func TestAccServer_AlterTags(t *testing.T) {
10091015
}
10101016

10111017
func TestAccServer_WithDefaultRootVolumeAndAdditionalVolume(t *testing.T) {
1018+
t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
1019+
10121020
tt := acctest.NewTestTools(t)
10131021
defer tt.Cleanup()
10141022
resource.ParallelTest(t, resource.TestCase{
@@ -1041,6 +1049,8 @@ func TestAccServer_WithDefaultRootVolumeAndAdditionalVolume(t *testing.T) {
10411049
}
10421050

10431051
func TestAccServer_ServerWithBlockNonDefaultZone(t *testing.T) {
1052+
t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
1053+
10441054
tt := acctest.NewTestTools(t)
10451055
defer tt.Cleanup()
10461056
resource.ParallelTest(t, resource.TestCase{
@@ -1714,21 +1724,21 @@ func TestAccServer_BlockExternal(t *testing.T) {
17141724
size_in_gb = 10
17151725
}
17161726
1717-
resource "scaleway_instance_volume" "volume" {
1718-
type = "b_ssd"
1719-
size_in_gb = 10
1727+
resource "scaleway_block_volume" "bigger-volume" {
1728+
iops = 15000
1729+
size_in_gb = 15
17201730
}
17211731
17221732
resource "scaleway_instance_server" "main" {
17231733
image = "ubuntu_jammy"
17241734
type = "PLAY2-PICO"
1725-
additional_volume_ids = [scaleway_block_volume.volume.id, scaleway_instance_volume.volume.id]
1735+
additional_volume_ids = [scaleway_block_volume.volume.id, scaleway_block_volume.bigger-volume.id]
17261736
}`,
17271737
Check: resource.ComposeTestCheckFunc(
17281738
resource.TestCheckResourceAttr("scaleway_instance_server.main", "type", "PLAY2-PICO"),
17291739
resource.TestCheckResourceAttr("scaleway_instance_server.main", "additional_volume_ids.#", "2"),
17301740
resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "additional_volume_ids.0", "scaleway_block_volume.volume", "id"),
1731-
resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "additional_volume_ids.1", "scaleway_instance_volume.volume", "id"),
1741+
resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "additional_volume_ids.1", "scaleway_block_volume.bigger-volume", "id"),
17321742
),
17331743
},
17341744
},

‎internal/services/instance/snapshot_data_source_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
)
1111

1212
func TestAccDataSourceSnapshot_Basic(t *testing.T) {
13+
t.Skip("Resources \"scaleway_instance_volume\" and \"scaleway_instance_snapshot\" are depracated")
14+
1315
tt := acctest.NewTestTools(t)
1416
defer tt.Cleanup()
1517

‎internal/services/instance/snapshot_test.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import (
1414
)
1515

1616
func TestAccSnapshot_BlockVolume(t *testing.T) {
17+
t.Skip("Resource \"scaleway_instance_snapshot\" is depracated for block volumes")
18+
1719
tt := acctest.NewTestTools(t)
1820
defer tt.Cleanup()
1921
resource.ParallelTest(t, resource.TestCase{
@@ -111,6 +113,8 @@ func TestAccSnapshot_Server(t *testing.T) {
111113
}
112114

113115
func TestAccSnapshot_ServerWithBlockVolume(t *testing.T) {
116+
t.Skip("Resource \"scaleway_instance_snapshot\" is depracated for block volumes")
117+
114118
tt := acctest.NewTestTools(t)
115119
defer tt.Cleanup()
116120
resource.ParallelTest(t, resource.TestCase{
@@ -153,6 +157,8 @@ func TestAccSnapshot_ServerWithBlockVolume(t *testing.T) {
153157
}
154158

155159
func TestAccSnapshot_RenameSnapshot(t *testing.T) {
160+
t.Skip("Resource \"scaleway_instance_snapshot\" is depracated for block volumes")
161+
156162
tt := acctest.NewTestTools(t)
157163
defer tt.Cleanup()
158164
resource.ParallelTest(t, resource.TestCase{
@@ -198,6 +204,9 @@ func TestAccSnapshot_RenameSnapshot(t *testing.T) {
198204
}
199205

200206
func TestAccSnapshot_FromObject(t *testing.T) {
207+
t.Skip("Resource \"scaleway_instance_snapshot\" is depracated")
208+
// TestAccSnapshot_FromS3 tests the same logic on the scaleway_block_snapshot resource
209+
201210
tt := acctest.NewTestTools(t)
202211
defer tt.Cleanup()
203212
resource.ParallelTest(t, resource.TestCase{
@@ -217,7 +226,7 @@ func TestAccSnapshot_FromObject(t *testing.T) {
217226
file = "testfixture/empty.qcow2"
218227
}
219228
220-
resource "scaleway_instance_snapshot" "snapshot" {
229+
resource "scaleway_block_snapshot" "snapshot" {
221230
name = "test-instance-snapshot-import-from-object"
222231
type = "b_ssd"
223232
import {

0 commit comments

Comments
 (0)