Merge ~hyask/autopkgtest-cloud:skia/fix_download-all-results into autopkgtest-cloud:master

Proposed by Skia
Status: Merged
Merged at revision: 721cf510db855144df85605413d63de3ecbcd4f4
Proposed branch: ~hyask/autopkgtest-cloud:skia/fix_download-all-results
Merge into: autopkgtest-cloud:master
Diff against target: 22 lines (+5/-6)
1 file modified
charms/focal/autopkgtest-web/webcontrol/download-all-results (+5/-6)
Reviewer Review Type Date Requested Status
Tim Andersson Approve
Review via email: mp+461457@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Andersson (andersson123) wrote :

we don't want all-proposed=null in the env column of the db, too much visual clutter on results pages. Please amend so this won't happen (i.e. only insert if value isn't null)

Revision history for this message
Tim Andersson (andersson123) wrote :

ah I just read properly, nvm

review: Approve
Revision history for this message
Tim Andersson (andersson123) wrote :

(approve as long as CI passes ovvi)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charms/focal/autopkgtest-web/webcontrol/download-all-results b/charms/focal/autopkgtest-web/webcontrol/download-all-results
2index 1af7918..e0a11b0 100755
3--- a/charms/focal/autopkgtest-web/webcontrol/download-all-results
4+++ b/charms/focal/autopkgtest-web/webcontrol/download-all-results
5@@ -175,12 +175,11 @@ def fetch_one_result(url):
6 exitcode,
7 )
8 env_vars = []
9- env_spec = {
10- "all-proposed": "all-proposed=1",
11- }
12- for env, spec in env_spec.items():
13- if env in testinfo.keys():
14- env_vars.append(spec)
15+ env_spec = ["all-proposed"]
16+ for env in env_spec:
17+ value = testinfo.get(env)
18+ if value is not None:
19+ env_vars.append("=".join([env, value]))
20
21 while True:
22 try:

Subscribers

People subscribed via source and target branches