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

Proposed by Haw Loeung
Status: Merged
Approved by: Colin Misare
Approved revision: f59ad443c0fe0fb93d3f791d334974859a215192
Merged at revision: 3758c746beb14a9e6fe721dfdf8c61625ae07e00
Proposed branch: ~hloeung/apt-stresstest-charm:cleanup
Merge into: apt-stresstest-charm:master
Diff against target: 16 lines (+4/-1)
1 file modified
files/test_apt_mirrors.py (+4/-1)
Reviewer Review Type Date Requested Status
Colin Misare Approve
Canonical IS Reviewers Pending
Review via email: mp+392642@code.launchpad.net

Commit message

Fixed missing series in logging

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 3758c746beb14a9e6fe721dfdf8c61625ae07e00

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/files/test_apt_mirrors.py b/files/test_apt_mirrors.py
2index 80cbf26..1446223 100755
3--- a/files/test_apt_mirrors.py
4+++ b/files/test_apt_mirrors.py
5@@ -258,7 +258,10 @@ def main():
6 ips = []
7
8 for ip in ips:
9- log.info("Creating chdist {}-{}-{}".format(domain, ip, args.series))
10+ series = args.series
11+ if not series:
12+ series = lsb_release()['DISTRIB_CODENAME']
13+ log.info("Creating chdist {}-{}-{}".format(domain, ip, series))
14 chdist_create(domain, ip, args.series)
15 log.info("chdist created for {} - {}. Running tests now.".format(domain, ip))
16 run_tests(

Subscribers

People subscribed via source and target branches