Remove Stop-Computer from PostReboot

George Gelashvili · idoru · XenoPhex · George Gelashvili · commit 0851e892d2b8 · 2020-08-11T11:43:37.000-04:00
to prevent shutting down too quickly after invoking sysprep, before it completes. this is a complementary change to bosh-psmodules use the /shutdown flag in sysprep.exe for vsphere (bosh-psmodules repo bb07093) [#174128738](https://www.pivotaltracker.com/story/show/174128738) Update the stemcell creation process to ensure UTC timezone Co-authored-by: Sam Coward <scoward@pivotal.io> Co-authored-by: Anand Gaitonde <agaitonde@pivotal.io> Co-authored-by: Sam Coward <scoward@pivotal.io> Co-authored-by: Anand Gaitonde <agaitonde@pivotal.io> Co-authored-by: Sam Coward <scoward@pivotal.io> Co-authored-by: Anand Gaitonde <agaitonde@pivotal.io>
diff --git a/stemcell-automation/AutomationHelpers.Tests.ps1 b/stemcell-automation/AutomationHelpers.Tests.ps1
@@ -61,23 +61,16 @@ Describe "PostReboot" {
         $postRebootCalls.IndexOf("CleanUpVM") | Should -BeLessThan $postRebootCalls.IndexOf("SysprepVM")
     }
 
-    It "syspreps right before shutting the VM down" {
+    It "syspreps as the last command" {
         PostReboot -Organization "org" -Owner "owner" -SkipRandomPassword:$false
         Assert-MockCalled -CommandName SysprepVM
         Assert-MockCalled -CommandName SysprepVM -ParameterFilter {
             $Organization -eq "org" -and
                     $Owner -eq "owner" -and
                     $SkipRandomPassword -eq $false
         }
-        $postRebootCalls.IndexOf("SysprepVM") | Should -BeLessThan $postRebootCalls.IndexOf("Stop-Computer")
-    }
-
-    It "powers off VM last" {
-        PostReboot
-
-        Assert-MockCalled -CommandName Stop-Computer
         $lastIndex = $postRebootCalls.Count - 1
-        $postRebootCalls.IndexOf("Stop-Computer") | Should -Be $lastIndex
+        $postRebootCalls.IndexOf("SysprepVM") | Should -Be $lastIndex
     }
 }
 
diff --git a/stemcell-automation/AutomationHelpers.ps1 b/stemcell-automation/AutomationHelpers.ps1
@@ -37,8 +37,6 @@ function PostReboot
     InstallCFCell
     CleanUpVM
     SysprepVM -Organization $Organization -Owner $Owner -SkipRandomPassword $SkipRandomPassword
-    Write-Log "Completed Sysprep. About to poweroff VM..."
-    Stop-Computer
 }
 
 function CopyPSModules

Original file line number	Diff line number	Diff line change
`@@ -61,23 +61,16 @@ Describe "PostReboot" {`
`61`	`61`	`$postRebootCalls.IndexOf("CleanUpVM") \| Should -BeLessThan $postRebootCalls.IndexOf("SysprepVM")`
`62`	`62`	`}`
`63`	`63`
`64`		`- It "syspreps right before shutting the VM down" {`
	`64`	`+ It "syspreps as the last command" {`
`65`	`65`	`PostReboot -Organization "org" -Owner "owner" -SkipRandomPassword:$false`
`66`	`66`	`Assert-MockCalled -CommandName SysprepVM`
`67`	`67`	`Assert-MockCalled -CommandName SysprepVM -ParameterFilter {`
`68`	`68`	`$Organization -eq "org" -and`
`69`	`69`	`$Owner -eq "owner" -and`
`70`	`70`	`$SkipRandomPassword -eq $false`
`71`	`71`	`}`
`72`		`- $postRebootCalls.IndexOf("SysprepVM") \| Should -BeLessThan $postRebootCalls.IndexOf("Stop-Computer")`
`73`		`- }`
`74`		`-`
`75`		`- It "powers off VM last" {`
`76`		`- PostReboot`
`77`		`-`
`78`		`- Assert-MockCalled -CommandName Stop-Computer`
`79`	`72`	`$lastIndex = $postRebootCalls.Count - 1`
`80`		`- $postRebootCalls.IndexOf("Stop-Computer") \| Should -Be $lastIndex`
	`73`	`+ $postRebootCalls.IndexOf("SysprepVM") \| Should -Be $lastIndex`
`81`	`74`	`}`
`82`	`75`	`}`
`83`	`76`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ function PostReboot`
`37`	`37`	`InstallCFCell`
`38`	`38`	`CleanUpVM`
`39`	`39`	`SysprepVM -Organization $Organization -Owner $Owner -SkipRandomPassword $SkipRandomPassword`
`40`		`- Write-Log "Completed Sysprep. About to poweroff VM..."`
`41`		`- Stop-Computer`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`function CopyPSModules`