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
diff --git a/config.yaml b/config.yaml
index 1aba4e7..769f546 100644
--- a/config.yaml
+++ b/config.yaml
@@ -16,8 +16,8 @@ options:
16 - ap-northeast-1.ec2.archive.ubuntu.com: 54.248.7.2216 - ap-northeast-1.ec2.archive.ubuntu.com: 54.248.7.22
17 stresstest-timeout:17 stresstest-timeout:
18 type: string18 type: string
19 default: "600s"19 default: "180s"
20 description: "The overall timeout for apt-stresstest script runs, including downloading of packages and a cloud image."20 description: "The overall timeout for apt-stresstest script runs, including downloading of packages."
21 stresstest-user:21 stresstest-user:
22 type: string22 type: string
23 default: "apt-stresstest"23 default: "apt-stresstest"
@@ -28,7 +28,7 @@ options:
28 description: "apt-get update timeout in seconds"28 description: "apt-get update timeout in seconds"
29 download-timeout:29 download-timeout:
30 type: string30 type: string
31 default: "60"31 default: "45"
32 description: >-32 description: >-
33 Download timeout in seconds. The timeout is applied to individual download operations.33 Download timeout in seconds. The timeout is applied to individual download operations.
34 For global timeout see stresstest-timeout option34 For global timeout see stresstest-timeout option

Subscribers

People subscribed via source and target branches