Merge ~hloeung/apt-stresstest-charm:cleanup into apt-stresstest-charm:master

Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 3057dcfbf397e9c9db60012f80da1c01576939e1
Merged at revision: 3cee63cc320f8bd349b2a26e47272ea24c561783
Proposed branch: ~hloeung/apt-stresstest-charm:cleanup
Merge into: apt-stresstest-charm:master
Diff against target: 24 lines (+3/-3)
1 file modified
config.yaml (+3/-3)
Reviewer Review Type Date Requested Status
Colin Misare Approve
Canonical IS Reviewers Pending
Review via email: mp+392505@code.launchpad.net

Commit message

We don't download cloud images any more so drop timeout

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Colin Misare (cmisare) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 3cee63cc320f8bd349b2a26e47272ea24c561783

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config.yaml b/config.yaml
2index 1aba4e7..769f546 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -16,8 +16,8 @@ options:
6 - ap-northeast-1.ec2.archive.ubuntu.com: 54.248.7.22
7 stresstest-timeout:
8 type: string
9- default: "600s"
10- description: "The overall timeout for apt-stresstest script runs, including downloading of packages and a cloud image."
11+ default: "180s"
12+ description: "The overall timeout for apt-stresstest script runs, including downloading of packages."
13 stresstest-user:
14 type: string
15 default: "apt-stresstest"
16@@ -28,7 +28,7 @@ options:
17 description: "apt-get update timeout in seconds"
18 download-timeout:
19 type: string
20- default: "60"
21+ default: "45"
22 description: >-
23 Download timeout in seconds. The timeout is applied to individual download operations.
24 For global timeout see stresstest-timeout option

Subscribers

People subscribed via source and target branches