Merge pull request #2396 from ClusterHQ/cinder-functional-tests-timeo…

…ut-bump-FLOC-3680

[FLOC-3680] Increase the Jenkins timeouts for running the Cinder functional test suite

build.yaml

@@ -1134,7 +1134,10 @@ job_type:
       publish_test_results: true
       coverage_report: true
       clean_repo: true
-      timeout: 45
+      # Give this job a slightly longer timeout because it has to interact with
+      # the cloud-supplied Cinder which can be a bit sluggish even in the best
+      # of times.
+      timeout: 90
 
     run_trial_for_cinder_storage_driver_on_Ubuntu_trusty:
       on_nodes_with_labels: 'rackspace-jenkins-slave-ubuntu14-standard-4-dfw'
@@ -1153,7 +1156,9 @@ job_type:
       publish_test_results: true
       coverage_report: true
       clean_repo: true
-      timeout: 45
+      # Reasoning for run_trial_for_cinder_storage_driver_on_CentOS_7's timeout
+      # applies here as well.
+      timeout: 90
 
 
   # http://build.clusterhq.com/builders/flocker-docs