Merge lp:~mthaddon/mojo/cassandra-charm-testing-timeout into lp:mojo/mojo-specs

[Tom Haddon]

charm-testing/cassandra: increase deployment timeout to allow cluster to bootstrap

charm-testing/cassandra: increase deployment timeout to allow cluster to bootstrap

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

Looking at the log, this was a genuine failure.

review: Disapprove

Unmerged revisions

117. By Tom Haddon on 2018-07-16

charm-testing/cassandra: increase deployment timeout to allow cluster to bootstrap

=== modified file 'charm-testing/cassandra/manifest'
--- charm-testing/cassandra/manifest	2017-08-22 11:56:00 +0000
+++ charm-testing/cassandra/manifest	2018-07-16 12:04:40 +0000
@@ -2,7 +2,7 @@
 collect config=collect
 script config=pre-deploy
 ## Deploy using deploy-secrets so we can specify an http_proxy in certain environments
-deploy config=deploy local=deploy-secrets wait=true timeout=3600
+deploy config=deploy local=deploy-secrets wait=true timeout=7200
 nagios-check retry=3 sleep=60
 verify config=post-deploy
 # Now test an upgrade to the new charm if UPGRADE_CHARM is set
@@ -16,6 +16,6 @@
 # Now redeploy the model, and test a deployment from scratch (with the updated charm in place)
 script config=redeploy-model
 script config=pre-deploy
-deploy config=deploy local=deploy-secrets wait=true
+deploy config=deploy local=deploy-secrets wait=true timeout=7200
 nagios-check retry=3 sleep=60
 verify config=post-deploy