Ubuntu Pastebin

Paste from martin at Thu, 19 May 2016 13:48:50 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
=== modified file 'britney'
--- britney	2016-04-22 08:31:25 +0000
+++ britney	2016-05-19 13:48:45 +0000
@@ -392,10 +392,23 @@
     esac
 }
 
+make_b2_notest_config () {
+    sed -e '/^NONINST_STATUS/ s/ *$/-notest/' \
+        -e '/^EXCUSES_.*OUTPUT/ s%=.*$%= /dev/null%' \
+        -e '/^UPGRADE_OUTPUT/ s/output.txt/output_notest.txt/' \
+        -e '/^HEIDI_OUTPUT/ s/=.*$/=/' \
+        -e '/^ADT_ENABLE/ s/yes/no/' \
+        "$1" > "$2"
+}
+
 run_b2 () {
   cd $BASE
   make_b2_config "$B2_CONFIG" "$B2_CONFIG.$DISTRIBUTION.$SERIES"
   $CODE_B2/britney.py -c "$B2_CONFIG.$DISTRIBUTION.$SERIES" -v --distribution=$DISTRIBUTION --series=$SERIES
+  if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
+      make_b2_notest_config "$B2_CONFIG.$DISTRIBUTION.$SERIES" "$B2_CONFIG.$DISTRIBUTION.$SERIES.notest"
+      $CODE_B2/britney.py -c "$B2_CONFIG.$DISTRIBUTION.$SERIES.notest" -v --distribution=$DISTRIBUTION --series=$SERIES
+  fi
 }
 
 if option run; then
@@ -468,6 +481,9 @@
     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
+    if [ -e $DATA_B2/output/$SERIES/output_notest.txt ]; then
+        cp $DATA_B2/output/$SERIES/output_notest.txt $HTML/$SERIES/update_output_notest.txt
+    fi
     cp $DATA_B2/$SERIES-proposed/Blocks $HTML/$SERIES/blocks.txt
   fi
   #gzip -9 < $HTML/$SERIES/update_excuses.html > $HTML/$SERIES/update_excuses.html.gz
Download as text