Skip to content

Commit 440030d

Browse files
Block backup vault creation tests to run in parallel (#11939) (#8415)
[upstream:6ff722b8e5211f9aa0a13e92bd1a47c66f1f2eb4] Signed-off-by: Modular Magician <[email protected]>
1 parent f6e891e commit 440030d

File tree

5 files changed

+37
-38
lines changed

5 files changed

+37
-38
lines changed

.changelog/11939.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
netapp: block google_cloud_netapp_backup_vaults tests to run in parallel
3+
```

google-beta/services/netapp/resource_netapp_backup_policy_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
)
1212

1313
func TestAccNetappBackupPolicy_NetappBackupPolicyFullExample_update(t *testing.T) {
14-
t.Parallel()
15-
1614
context := map[string]interface{}{
1715
"random_suffix": acctest.RandString(t, 10),
1816
}
@@ -57,7 +55,7 @@ func testAccNetappBackupPolicy_NetappBackupPolicyFullExample_basic(context map[s
5755
return acctest.Nprintf(`
5856
resource "google_netapp_backup_policy" "test_backup_policy_full" {
5957
name = "tf-test-test-backup-policy-full%{random_suffix}"
60-
location = "us-central1"
58+
location = "us-east4"
6159
daily_backup_limit = 2
6260
weekly_backup_limit = 0
6361
monthly_backup_limit = 0
@@ -70,7 +68,7 @@ func testAccNetappBackupPolicy_NetappBackupPolicyFullExample_updates(context map
7068
return acctest.Nprintf(`
7169
resource "google_netapp_backup_policy" "test_backup_policy_full" {
7270
name = "tf-test-test-backup-policy-full%{random_suffix}"
73-
location = "us-central1"
71+
location = "us-east4"
7472
daily_backup_limit = 6
7573
weekly_backup_limit = 4
7674
monthly_backup_limit = 3
@@ -88,7 +86,7 @@ func testAccNetappBackupPolicy_NetappBackupPolicyFullExample_disable(context map
8886
return acctest.Nprintf(`
8987
resource "google_netapp_backup_policy" "test_backup_policy_full" {
9088
name = "tf-test-test-backup-policy-full%{random_suffix}"
91-
location = "us-central1"
89+
location = "us-east4"
9290
daily_backup_limit = 2
9391
weekly_backup_limit = 1
9492
monthly_backup_limit = 1

google-beta/services/netapp/resource_netapp_backup_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ data "google_compute_network" "default" {
5353
5454
resource "google_netapp_storage_pool" "default" {
5555
name = "tf-test-backup-pool%{random_suffix}"
56-
location = "us-central1"
56+
location = "us-west2"
5757
service_level = "PREMIUM"
5858
capacity_gib = "2048"
5959
network = data.google_compute_network.default.id
@@ -112,7 +112,7 @@ data "google_compute_network" "default" {
112112
113113
resource "google_netapp_storage_pool" "default" {
114114
name = "tf-test-backup-pool%{random_suffix}"
115-
location = "us-central1"
115+
location = "us-west2"
116116
service_level = "PREMIUM"
117117
capacity_gib = "2048"
118118
network = data.google_compute_network.default.id

google-beta/services/netapp/resource_netapp_backup_vault_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import (
1616
)
1717

1818
func TestAccNetappBackupVault_NetappBackupVaultExample_update(t *testing.T) {
19-
t.Parallel()
20-
2119
context := map[string]interface{}{
2220
"random_suffix": acctest.RandString(t, 10),
2321
}

google-beta/services/netapp/resource_netapp_volume_test.go

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ func testAccNetappVolume_volumeBasicExample_basic(context map[string]interface{}
114114
return acctest.Nprintf(`
115115
resource "google_netapp_storage_pool" "default" {
116116
name = "tf-test-test-pool%{random_suffix}"
117-
location = "us-west2"
117+
location = "us-west4"
118118
service_level = "PREMIUM"
119119
capacity_gib = "2048"
120120
network = data.google_compute_network.default.id
121121
}
122122
123123
resource "google_netapp_volume" "test_volume" {
124-
location = "us-west2"
124+
location = "us-west4"
125125
name = "tf-test-test-volume%{random_suffix}"
126126
capacity_gib = "100"
127127
share_name = "tf-test-test-volume%{random_suffix}"
@@ -139,22 +139,22 @@ func testAccNetappVolume_volumeBasicExample_full(context map[string]interface{})
139139
return acctest.Nprintf(`
140140
resource "google_netapp_storage_pool" "default" {
141141
name = "tf-test-test-pool%{random_suffix}"
142-
location = "us-west2"
142+
location = "us-west4"
143143
service_level = "PREMIUM"
144144
capacity_gib = "2048"
145145
network = data.google_compute_network.default.id
146146
}
147147
148148
resource "google_netapp_storage_pool" "default2" {
149149
name = "tf-test-pool%{random_suffix}"
150-
location = "us-west2"
150+
location = "us-west4"
151151
service_level = "EXTREME"
152152
capacity_gib = "2048"
153153
network = data.google_compute_network.default.id
154154
}
155155
156156
resource "google_netapp_volume" "test_volume" {
157-
location = "us-west2"
157+
location = "us-west4"
158158
name = "tf-test-test-volume%{random_suffix}"
159159
capacity_gib = "100"
160160
share_name = "tf-test-test-volume%{random_suffix}"
@@ -226,21 +226,21 @@ func testAccNetappVolume_volumeBasicExample_update(context map[string]interface{
226226
return acctest.Nprintf(`
227227
resource "google_netapp_storage_pool" "default" {
228228
name = "tf-test-test-pool%{random_suffix}"
229-
location = "us-west2"
229+
location = "us-west4"
230230
service_level = "PREMIUM"
231231
capacity_gib = "2048"
232232
network = data.google_compute_network.default.id
233233
}
234234
resource "google_netapp_storage_pool" "default2" {
235235
name = "tf-test-pool%{random_suffix}"
236-
location = "us-west2"
236+
location = "us-west4"
237237
service_level = "EXTREME"
238238
capacity_gib = "2048"
239239
network = data.google_compute_network.default.id
240240
}
241241
242242
resource "google_netapp_volume" "test_volume" {
243-
location = "us-west2"
243+
location = "us-west4"
244244
name = "tf-test-test-volume%{random_suffix}"
245245
capacity_gib = "200"
246246
share_name = "tf-test-test-volume%{random_suffix}"
@@ -307,14 +307,14 @@ func testAccNetappVolume_volumeBasicExample_updatesnapshot(context map[string]in
307307
return acctest.Nprintf(`
308308
resource "google_netapp_storage_pool" "default2" {
309309
name = "tf-test-pool%{random_suffix}"
310-
location = "us-west2"
310+
location = "us-west4"
311311
service_level = "EXTREME"
312312
capacity_gib = "2048"
313313
network = data.google_compute_network.default.id
314314
}
315315
316316
resource "google_netapp_volume" "test_volume" {
317-
location = "us-west2"
317+
location = "us-west4"
318318
name = "tf-test-test-volume%{random_suffix}"
319319
capacity_gib = "200"
320320
share_name = "tf-test-test-volume%{random_suffix}"
@@ -366,14 +366,14 @@ func testAccNetappVolume_volumeBasicExample_createclonevolume(context map[string
366366
return acctest.Nprintf(`
367367
resource "google_netapp_storage_pool" "default2" {
368368
name = "tf-test-pool%{random_suffix}"
369-
location = "us-west2"
369+
location = "us-west4"
370370
service_level = "EXTREME"
371371
capacity_gib = "2048"
372372
network = data.google_compute_network.default.id
373373
}
374374
375375
resource "google_netapp_volume" "test_volume" {
376-
location = "us-west2"
376+
location = "us-west4"
377377
name = "tf-test-test-volume%{random_suffix}"
378378
capacity_gib = "200"
379379
share_name = "tf-test-test-volume%{random_suffix}"
@@ -415,7 +415,7 @@ resource "google_netapp_volume_snapshot" "test-snapshot" {
415415
}
416416
417417
resource "google_netapp_volume" "test_volume_clone" {
418-
location = "us-west2"
418+
location = "us-west4"
419419
name = "tf-test-test-volume-clone%{random_suffix}"
420420
capacity_gib = "200"
421421
share_name = "tf-test-test-volume-clone%{random_suffix}"
@@ -438,14 +438,14 @@ func testAccNetappVolume_volumeBasicExample_createBackupConfig(context map[strin
438438
return acctest.Nprintf(`
439439
resource "google_netapp_storage_pool" "default2" {
440440
name = "tf-test-pool%{random_suffix}"
441-
location = "us-west2"
441+
location = "us-west4"
442442
service_level = "EXTREME"
443443
capacity_gib = "2048"
444444
network = data.google_compute_network.default.id
445445
}
446446
447447
resource "google_netapp_volume" "test_volume" {
448-
location = "us-west2"
448+
location = "us-west4"
449449
name = "tf-test-test-volume%{random_suffix}"
450450
capacity_gib = "200"
451451
share_name = "tf-test-test-volume%{random_suffix}"
@@ -471,13 +471,13 @@ resource "time_sleep" "wait_30_minutes" {
471471
}
472472
473473
resource "google_netapp_backup_vault" "backup-vault" {
474-
location = "us-west2"
474+
location = "us-west4"
475475
name = "tf-test-vault%{random_suffix}"
476476
}
477477
478478
resource "google_netapp_backup_policy" "backup-policy" {
479479
name = "tf-test-backup-policy%{random_suffix}"
480-
location = "us-west2"
480+
location = "us-west4"
481481
daily_backup_limit = 2
482482
weekly_backup_limit = 0
483483
monthly_backup_limit = 0
@@ -495,14 +495,14 @@ func testAccNetappVolume_volumeBasicExample_updateBackupConfigRemoveBackupPolicy
495495
return acctest.Nprintf(`
496496
resource "google_netapp_storage_pool" "default2" {
497497
name = "tf-test-pool%{random_suffix}"
498-
location = "us-west2"
498+
location = "us-west4"
499499
service_level = "EXTREME"
500500
capacity_gib = "2048"
501501
network = data.google_compute_network.default.id
502502
}
503503
504504
resource "google_netapp_volume" "test_volume" {
505-
location = "us-west2"
505+
location = "us-west4"
506506
name = "tf-test-test-volume%{random_suffix}"
507507
capacity_gib = "200"
508508
share_name = "tf-test-test-volume%{random_suffix}"
@@ -524,13 +524,13 @@ resource "time_sleep" "wait_30_minutes" {
524524
}
525525
526526
resource "google_netapp_backup_vault" "backup-vault" {
527-
location = "us-west2"
527+
location = "us-west4"
528528
name = "tf-test-vault%{random_suffix}"
529529
}
530530
531531
resource "google_netapp_backup_policy" "backup-policy" {
532532
name = "tf-test-backup-policy%{random_suffix}"
533-
location = "us-west2"
533+
location = "us-west4"
534534
daily_backup_limit = 2
535535
weekly_backup_limit = 0
536536
monthly_backup_limit = 0
@@ -548,14 +548,14 @@ func testAccNetappVolume_volumeBasicExample_updateBackupConfigRemoveBackupVault(
548548
return acctest.Nprintf(`
549549
resource "google_netapp_storage_pool" "default2" {
550550
name = "tf-test-pool%{random_suffix}"
551-
location = "us-west2"
551+
location = "us-west4"
552552
service_level = "EXTREME"
553553
capacity_gib = "2048"
554554
network = data.google_compute_network.default.id
555555
}
556556
557557
resource "google_netapp_volume" "test_volume" {
558-
location = "us-west2"
558+
location = "us-west4"
559559
name = "tf-test-test-volume%{random_suffix}"
560560
capacity_gib = "200"
561561
share_name = "tf-test-test-volume%{random_suffix}"
@@ -574,13 +574,13 @@ resource "time_sleep" "wait_30_minutes" {
574574
}
575575
576576
resource "google_netapp_backup_vault" "backup-vault" {
577-
location = "us-west2"
577+
location = "us-west4"
578578
name = "tf-test-vault%{random_suffix}"
579579
}
580580
581581
resource "google_netapp_backup_policy" "backup-policy" {
582582
name = "tf-test-backup-policy%{random_suffix}"
583-
location = "us-west2"
583+
location = "us-west4"
584584
daily_backup_limit = 2
585585
weekly_backup_limit = 0
586586
monthly_backup_limit = 0
@@ -701,14 +701,14 @@ func testAccNetappVolume_autoTieredVolume_default(context map[string]interface{}
701701
return acctest.Nprintf(`
702702
resource "google_netapp_storage_pool" "default" {
703703
name = "tf-test-pool%{random_suffix}"
704-
location = "us-west2"
704+
location = "us-west4"
705705
service_level = "PREMIUM"
706706
capacity_gib = "2048"
707707
network = data.google_compute_network.default.id
708708
allow_auto_tiering = true
709709
}
710710
resource "google_netapp_volume" "test_volume" {
711-
location = "us-west2"
711+
location = "us-west4"
712712
name = "tf-test-volume%{random_suffix}"
713713
capacity_gib = "100"
714714
share_name = "tf-test-volume%{random_suffix}"
@@ -729,15 +729,15 @@ func testAccNetappVolume_autoTieredVolume_custom(context map[string]interface{})
729729
return acctest.Nprintf(`
730730
resource "google_netapp_storage_pool" "default" {
731731
name = "tf-test-pool%{random_suffix}"
732-
location = "us-west2"
732+
location = "us-west4"
733733
service_level = "PREMIUM"
734734
capacity_gib = "2048"
735735
network = data.google_compute_network.default.id
736736
allow_auto_tiering = true
737737
}
738738
739739
resource "google_netapp_volume" "test_volume" {
740-
location = "us-west2"
740+
location = "us-west4"
741741
name = "tf-test-volume%{random_suffix}"
742742
capacity_gib = "100"
743743
share_name = "tf-test-volume%{random_suffix}"

0 commit comments

Comments
 (0)