Merge remote-tracking branch 'local-from/develop' into HEAD

cloudfoundry · Oct 11, 2018 · 2d781ef · 2d781ef
2 parents 48203ce + 01db7df
commit 2d781ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/lib/packer/config/gcp.rb b/lib/packer/config/gcp.rb
@@ -32,6 +32,7 @@ def builders
                 'winrm_username' => 'winrmuser',
                 'winrm_use_ssl' => false,
                 'winrm_timeout' => '1h',
+                'state_timeout' => '10m',
                 'metadata' => {
                     'sysprep-specialize-script-url' => 'https://raw.githubusercontent.com/cloudfoundry-incubator/bosh-windows-stemcell-builder/master/scripts/gcp/setup-winrm.ps1',
                     'name' => "#{@vm_prefix}-#{Time.now.to_i}",

diff --git a/spec/packer/config/gcp_spec.rb b/spec/packer/config/gcp_spec.rb
@@ -35,6 +35,7 @@
             'winrm_username' => 'winrmuser',
             'winrm_use_ssl' => false,
             'winrm_timeout' => '1h',
+            'state_timeout' => '10m',
             'metadata' => {
                 'sysprep-specialize-script-url' => 'https://raw.githubusercontent.com/cloudfoundry-incubator/bosh-windows-stemcell-builder/master/scripts/gcp/setup-winrm.ps1',
                 'name' => "some-vm-prefix-#{Time.now.to_i}"