compute - Fix acc tests (#18398)

hashicorp · Sep 15, 2022 · cf51a7c · cf51a7c
1 parent e62a6f3
commit cf51a7c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/internal/services/compute/dedicated_host_resource_test.go b/internal/services/compute/dedicated_host_resource_test.go
@@ -202,7 +202,7 @@ resource "azurerm_dedicated_host" "test" {
   name                    = "acctest-DH-%d"
   location                = azurerm_resource_group.test.location
   dedicated_host_group_id = azurerm_dedicated_host_group.test.id
-  sku_name                = "DCSv2-Type1"
+  sku_name                = "FSv2-Type2"
   platform_fault_domain   = 1
 }
 `, r.template(data), data.RandomInteger)

diff --git a/internal/services/compute/linux_virtual_machine_scale_set_images_resource_test.go b/internal/services/compute/linux_virtual_machine_scale_set_images_resource_test.go
@@ -688,9 +688,9 @@ func (r LinuxVirtualMachineScaleSetResource) imagesPlan(data acceptance.TestData
 %s
 
 resource "azurerm_marketplace_agreement" "test" {
-  publisher = "cloudbees"
-  offer     = "jenkins-operations-center"
-  plan      = "jenkins-operations-center-solo"
+  publisher = "cloudwhizsolutions"
+  offer     = "jenkins-docker-container-with-ubuntu-server"
+  plan      = "jenkins-docker-container-with-ubuntu-server-cw"
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
@@ -705,9 +705,9 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   disable_password_authentication = false
 
   source_image_reference {
-    publisher = "cloudbees"
-    offer     = "jenkins-operations-center"
-    sku       = "jenkins-operations-center-solo"
+    publisher = "cloudwhizsolutions"
+    offer     = "jenkins-docker-container-with-ubuntu-server"
+    sku       = "jenkins-docker-container-with-ubuntu-server-cw"
     version   = "latest"
   }
 
@@ -728,9 +728,9 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   plan {
-    name      = "jenkins-operations-center-solo"
-    product   = "jenkins-operations-center"
-    publisher = "cloudbees"
+    name      = "jenkins-docker-container-with-ubuntu-server-cw"
+    product   = "jenkins-docker-container-with-ubuntu-server"
+    publisher = "cloudwhizsolutions"
   }
 
   depends_on = ["azurerm_marketplace_agreement.test"]

diff --git a/internal/services/compute/linux_virtual_machine_scale_set_other_resource_test.go b/internal/services/compute/linux_virtual_machine_scale_set_other_resource_test.go
@@ -1071,7 +1071,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   name                = "acctestvmss-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
+  sku                 = "Standard_D2s_v3" # intentional for premium/edgezones
   instances           = 1
   admin_username      = "adminuser"
   admin_password      = "P@ssword1234!"

diff --git a/internal/services/compute/windows_virtual_machine_resource_other_test.go b/internal/services/compute/windows_virtual_machine_resource_other_test.go
@@ -1607,7 +1607,7 @@ resource "azurerm_windows_virtual_machine" "test" {
   name                = local.vm_name
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  size                = "Standard_F2"
+  size                = "Standard_D2s_v3" # intentional for premium/edgezones
   admin_username      = "adminuser"
   admin_password      = "P@$$w0rd1234!"
   edge_zone           = data.azurerm_extended_locations.test.extended_locations[0]

diff --git a/internal/services/compute/windows_virtual_machine_scale_set_extensions_test.go b/internal/services/compute/windows_virtual_machine_scale_set_extensions_test.go
@@ -1129,8 +1129,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   extension {
     name                       = "AzurePolicyforWindows"
     publisher                  = "Microsoft.GuestConfiguration"
-    type                       = "ConfigurationforLinux"
-    type_handler_version       = "1.0"
+    type                       = "ConfigurationforWindows"
+    type_handler_version       = "1.29"
     auto_upgrade_minor_version = false
     automatic_upgrade_enabled  = true
   }

diff --git a/internal/services/compute/windows_virtual_machine_scale_set_other_resource_test.go b/internal/services/compute/windows_virtual_machine_scale_set_other_resource_test.go
@@ -1244,7 +1244,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   name                = local.vm_name
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
+  sku                 = "Standard_D2s_v3" # intentional for premium/edgezones
   instances           = 1
   admin_username      = "adminuser"
   admin_password      = "P@ssword1234!"

diff --git a/website/docs/r/policy_virtual_machine_configuration_assignment.html.markdown b/website/docs/r/policy_virtual_machine_configuration_assignment.html.markdown
@@ -79,7 +79,7 @@ resource "azurerm_virtual_machine_extension" "example" {
   virtual_machine_id         = azurerm_windows_virtual_machine.example.id
   publisher                  = "Microsoft.GuestConfiguration"
   type                       = "ConfigurationforWindows"
-  type_handler_version       = "1.0"
+  type_handler_version       = "1.29"
   auto_upgrade_minor_version = "true"
 }