Merge lp:~cjwatson/britney/output-prefix into lp:~ubuntu-release/britney/britney1-ubuntu

Proposed by Colin Watson on 2015-02-09
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp:~cjwatson/britney/output-prefix
Merge into: lp:~ubuntu-release/britney/britney1-ubuntu
Diff against target: 48 lines (+13/-13)
1 file modified
britney (+13/-13)
To merge this branch: bzr merge lp:~cjwatson/britney/output-prefix
Reviewer Review Type Date Requested Status
Steve Langasek 2015-02-09 Approve on 2015-02-13
Review via email: mp+249048@code.launchpad.net

Commit message

If OUTPUT_PREFIX is set in the environment, prepend that to output file names.

Description of the change

If OUTPUT_PREFIX is set in the environment, prepend that to output file names.

This makes it possible to run multiple parallel instances for ubuntu-rtm in the short term, and also for Ubuntu stable series later on.

To post a comment you must log in.
Steve Langasek (vorlon) wrote :

Would it perhaps be better to use a subdirectory for this, rather than a file prefix?

The code changes themselves look fine to me.

lp:~cjwatson/britney/output-prefix updated on 2015-02-13
274. By Colin Watson on 2015-02-13

Use subdirectory rather than file prefix.

Colin Watson (cjwatson) wrote :

Mm, that makes some sense. And then we can just put everything consistently in a subdirectory, and for URL compatibility have the top-level update_* be symlinks/redirects/whatever to the current series. Please re-review?

Steve Langasek (vorlon) wrote :

Would it perhaps be better to use a subdirectory for this, rather than a file prefix?

The code changes themselves look fine to me.

Steve Langasek (vorlon) wrote :

looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'britney'
2--- britney 2014-12-10 14:55:57 +0000
3+++ britney 2015-02-13 17:28:19 +0000
4@@ -404,23 +404,23 @@
5
6 stats () {
7 echo STATS:
8- mkdir -p "$HTML"
9+ mkdir -p "$HTML/$SERIES"
10 if [ "$1" = "b1" ]; then
11- cp $UPDATE_OUT/update.EXCUSES_py $HTML/update_excuses.html
12- cp $UPDATE_OUT/update.OUTPUT_py $HTML/update_output.txt
13+ cp $UPDATE_OUT/update.EXCUSES_py $HTML/$SERIES/update_excuses.html
14+ cp $UPDATE_OUT/update.OUTPUT_py $HTML/$SERIES/update_output.txt
15 else
16- cp $DATA_B2/output/$SERIES/excuses.html $HTML/update_excuses.html
17- cp $DATA_B2/output/$SERIES/excuses.yaml $HTML/update_excuses.yaml
18- cp $DATA_B2/output/$SERIES/output.txt $HTML/update_output.txt
19- cp $DATA_B2/$SERIES-proposed/Blocks $HTML/blocks.txt
20+ cp $DATA_B2/output/$SERIES/excuses.html $HTML/$SERIES/update_excuses.html
21+ cp $DATA_B2/output/$SERIES/excuses.yaml $HTML/$SERIES/update_excuses.yaml
22+ cp $DATA_B2/output/$SERIES/output.txt $HTML/$SERIES/update_output.txt
23+ cp $DATA_B2/$SERIES-proposed/Blocks $HTML/$SERIES/blocks.txt
24 fi
25- #gzip -9 < $HTML/update_excuses.html > $HTML/update_excuses.html.gz
26- #gzip -9 < $HTML/update_output.txt > $HTML/update_output.txt.gz
27+ #gzip -9 < $HTML/$SERIES/update_excuses.html > $HTML/$SERIES/update_excuses.html.gz
28+ #gzip -9 < $HTML/$SERIES/update_output.txt > $HTML/$SERIES/update_output.txt.gz
29 mkdir -p "$HTML/update_output/$SERIES/${NOW%/*}"
30 mkdir -p "$HTML/update_excuses/$SERIES/${NOW%/*}"
31- gzip -9c $HTML/update_output.txt > $HTML/update_output/$SERIES/$NOW.txt.gz
32- gzip -9c $HTML/update_excuses.html > $HTML/update_excuses/$SERIES/$NOW.html.gz
33- gzip -9c $HTML/update_excuses.yaml > $HTML/update_excuses/$SERIES/$NOW.yaml.gz
34+ gzip -9c $HTML/$SERIES/update_output.txt > $HTML/update_output/$SERIES/$NOW.txt.gz
35+ gzip -9c $HTML/$SERIES/update_excuses.html > $HTML/update_excuses/$SERIES/$NOW.html.gz
36+ gzip -9c $HTML/$SERIES/update_excuses.yaml > $HTML/update_excuses/$SERIES/$NOW.yaml.gz
37
38 # TODO: {stable,unstable}_uninst.txt -- needs support in b2, talk to Fabio
39 # TODO: this creates uninstallability reports against b2 results, not b1's
40@@ -434,7 +434,7 @@
41 #create_ood_report $DATA_B2/stable stable_outdate.txt
42 #create_ood_report $DATA_B2/testing testing_outdate.txt
43
44- $SCRIPTS/backlog-report -o $HTML/update_excuses.csv $HTML/update_excuses.html
45+ $SCRIPTS/backlog-report -o $HTML/$SERIES/update_excuses.csv $HTML/$SERIES/update_excuses.html
46 }
47
48 if option stats_b1; then

Subscribers

People subscribed via source and target branches