Merge pull request crowbar#1070 from jsuchome/timeouts

Increase timeouts for upgrade related actions
aspiers · Feb 7, 2017 · 967b7dc · 967b7dc
2 parents f317da8 + 89f7b06
commit 967b7dc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/crowbar_framework/app/models/api/node.rb b/crowbar_framework/app/models/api/node.rb
@@ -47,7 +47,7 @@ def prepare_repositories
     end
 
     def os_upgrade
-      execute_and_wait_for_finish("/usr/sbin/crowbar-upgrade-os.sh", 600)
+      execute_and_wait_for_finish("/usr/sbin/crowbar-upgrade-os.sh", 900)
       Rails.logger.info("Package upgrade was successful.")
     rescue StandardError => e
       Api::Upgrade.raise_node_upgrade_error(
@@ -74,7 +74,7 @@ def join_and_chef
         @node.save
       end
       begin
-        execute_and_wait_for_finish("/usr/sbin/crowbar-chef-upgraded.sh", 600)
+        execute_and_wait_for_finish("/usr/sbin/crowbar-chef-upgraded.sh", 900)
       rescue StandardError => e
         Api::Upgrade.raise_node_upgrade_error(
           "Error while running the initial chef-client. " + e.message
@@ -94,7 +94,7 @@ def join_and_chef
     end
 
     def wait_for_ssh_state(desired_state, action)
-      Timeout.timeout(300) do
+      Timeout.timeout(400) do
         loop do
           ssh_status = @node.ssh_cmd("").first
           break if desired_state == :up ? ssh_status == 200 : ssh_status != 200