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

[Colin Watson]

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

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.

[Steve Langasek (vorlon)]

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]

274. By Colin Watson on 2015-02-13

Use subdirectory rather than file prefix.

[Colin Watson (cjwatson)]

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)]

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)]

looks good to me.

review: Approve

=== modified file 'britney'
--- britney	2014-12-10 14:55:57 +0000
+++ britney	2015-02-13 17:28:19 +0000
@@ -404,23 +404,23 @@
 
 stats () {
   echo STATS:
-  mkdir -p "$HTML"
+  mkdir -p "$HTML/$SERIES"
   if [ "$1" = "b1" ]; then
-    cp $UPDATE_OUT/update.EXCUSES_py $HTML/update_excuses.html
-    cp $UPDATE_OUT/update.OUTPUT_py $HTML/update_output.txt
+    cp $UPDATE_OUT/update.EXCUSES_py $HTML/$SERIES/update_excuses.html
+    cp $UPDATE_OUT/update.OUTPUT_py $HTML/$SERIES/update_output.txt
   else
-    cp $DATA_B2/output/$SERIES/excuses.html $HTML/update_excuses.html
-    cp $DATA_B2/output/$SERIES/excuses.yaml $HTML/update_excuses.yaml
-    cp $DATA_B2/output/$SERIES/output.txt $HTML/update_output.txt
-    cp $DATA_B2/$SERIES-proposed/Blocks $HTML/blocks.txt
+    cp $DATA_B2/output/$SERIES/excuses.html $HTML/$SERIES/update_excuses.html
+    cp $DATA_B2/output/$SERIES/excuses.yaml $HTML/$SERIES/update_excuses.yaml
+    cp $DATA_B2/output/$SERIES/output.txt $HTML/$SERIES/update_output.txt
+    cp $DATA_B2/$SERIES-proposed/Blocks $HTML/$SERIES/blocks.txt
   fi
-  #gzip -9 < $HTML/update_excuses.html > $HTML/update_excuses.html.gz
-  #gzip -9 < $HTML/update_output.txt > $HTML/update_output.txt.gz
+  #gzip -9 < $HTML/$SERIES/update_excuses.html > $HTML/$SERIES/update_excuses.html.gz
+  #gzip -9 < $HTML/$SERIES/update_output.txt > $HTML/$SERIES/update_output.txt.gz
   mkdir -p "$HTML/update_output/$SERIES/${NOW%/*}"
   mkdir -p "$HTML/update_excuses/$SERIES/${NOW%/*}"
-  gzip -9c $HTML/update_output.txt > $HTML/update_output/$SERIES/$NOW.txt.gz
-  gzip -9c $HTML/update_excuses.html > $HTML/update_excuses/$SERIES/$NOW.html.gz
-  gzip -9c $HTML/update_excuses.yaml > $HTML/update_excuses/$SERIES/$NOW.yaml.gz
+  gzip -9c $HTML/$SERIES/update_output.txt > $HTML/update_output/$SERIES/$NOW.txt.gz
+  gzip -9c $HTML/$SERIES/update_excuses.html > $HTML/update_excuses/$SERIES/$NOW.html.gz
+  gzip -9c $HTML/$SERIES/update_excuses.yaml > $HTML/update_excuses/$SERIES/$NOW.yaml.gz
 
   # TODO: {stable,unstable}_uninst.txt -- needs support in b2, talk to Fabio
   # TODO: this creates uninstallability reports against b2 results, not b1's
@@ -434,7 +434,7 @@
   #create_ood_report $DATA_B2/stable stable_outdate.txt
   #create_ood_report $DATA_B2/testing testing_outdate.txt
 
-  $SCRIPTS/backlog-report -o $HTML/update_excuses.csv $HTML/update_excuses.html
+  $SCRIPTS/backlog-report -o $HTML/$SERIES/update_excuses.csv $HTML/$SERIES/update_excuses.html
 }
 
 if option stats_b1; then