1097380 - Support REBOOT_AFTER_PUPPET on Windows

Status: RESOLVED FIXED

(Infrastructure & Operations :: RelOps: Puppet, task)

Description

[Dustin J. Mitchell [:dustin] (he/him)]

Various bits of puppet, such as installing new drivers, require a reboot after the puppet run.  There are two places to support this (look for REBOOT_AFTER_PUPPET to find them):

* in the manifests, so that things like new drivers can make a request
* in the script that runs puppet on startup (runpuppet.rb)

Comment 1

[Morgan Phillips [:mrrrgn]]

Attachment: reboot.windows.diff

Comment 2

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8541804 [details] [diff] [review]
reboot.windows.diff

Review of attachment 8541804 [details] [diff] [review]:
-----------------------------------------------------------------

r+ with a `sleep` added in and comment updated.

::: modules/puppet/templates/puppet-atboot-runpuppet.rb.erb
@@ +19,5 @@
>  SEMAPHORE = <%= @puppet_semaphore.inspect %>
>  File.delete(SEMAPHORE) if File.exists?(SEMAPHORE)
>  
> +# the REBOOT_FLAG_FILE indicates that we should reboot after running puppet. The flag
> +# should be set server side so we should remove the flag file before each run.

Not quite "server side" but rather "by the `puppet agent` run"

@@ +51,5 @@
>              if run_puppet(puppetmaster)
> +                if File.exists?(REBOOT_FLAG_FILE)
> +                    File.delete(REBOOT_FLAG_FILE)
> +                    puts "Rebooting as requested"
> +                    system('shutdown /r /f /t 0')

This will need to intentionally hang, otherwise runner/buildbot will start while the shutdown operation is percolating -- see https://github.com/mozilla/build-puppet/blob/master/modules/puppet/templates/puppet-atboot-common.erb#L84

Comment 3

[Morgan Phillips [:mrrrgn]]

Attachment: reboot.windows.diff