summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-04-08 10:04:28 +0200
committerHolger Levsen <holger@layer-acht.org>2015-04-18 18:03:01 +0200
commitb94fd3a99dd3148519031bf1924ff8fca8123fa0 (patch)
treee62dc8902a687533fde487e458331e191f7a8b20
parent977dec969ec0417c11aa4eca8b9d3f65c34be2d6 (diff)
downloadjenkins.debian.net-b94fd3a99dd3148519031bf1924ff8fca8123fa0.tar.xz
reproducible: build: refactor: one todo item down \o/
-rw-r--r--TODO3
-rwxr-xr-xbin/reproducible_build.sh4
2 files changed, 3 insertions, 4 deletions
diff --git a/TODO b/TODO
index 2d1e55c1..d1a6e877 100644
--- a/TODO
+++ b/TODO
@@ -156,14 +156,12 @@ grep '(=.*).,.$' rygel_0.24.2-1.debbindiff.html | uniq -c | sort | grep -c '^\s*
** the grepping should probably only done on files younger then $check_frequency
* misc
-** reproducible: dont delete userContent/$pkg on build begin..
** move all content into /var/lib/userContent/reproducible/
** more graphs: graph average build duration by day
** meld bin/reproducible_setup_schroot.sh into bin/schroot-create.sh and alias the former to the latter
** "fork" etc/schroot/default into etc/schroot/reproducible
** use one css for all, not two minimally different ones
** repo-comparison: check for binaries without source
-** turn job-cfg/g-i.yaml into .yaml.py
* notes related
** hint issues of a package while hovering over it
@@ -224,6 +222,7 @@ These small changes are probably still worth doing anyway:
* g-i: replace '--' with '---' as param delimiter. see #776763 / 5df5b95908 in d-e-c
* download .isos once in central place
* g-i_presentation: use preseeding files on jenkins.d.n and not hands.com
+* turn job-cfg/g-i.yaml into .yaml.py
The following ideas should really only be implemented for the new 'lvc*' tests.... (but are kept here for now)
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 552d78e7..569a318b 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -352,7 +352,7 @@ build_rebuild() {
if [ -f b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
# both builds were fine, i.e., they did not FTBFS.
FTBFS=0
- cleanup_userContent # FIXME check wheter my changes here are fine
+ cleanup_userContent
chmod 644 $RBUILDLOG
mv $RBUILDLOG /var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
RBUILDLOG=/var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log
@@ -378,7 +378,7 @@ cd $TMPDIR
DATE=$(date +'%Y-%m-%d %H:%M')
START=$(date +'%s')
-RBUILDLOG=$(mktemp --tmpdir=$TMPDIR) # FIXME check wheter my changes here are fine
+RBUILDLOG=$(mktemp --tmpdir=$TMPDIR)
choose_package # defines SUITE, PKGID, SRCPACKAGE, SCHEDULED_DATE, SAVE_ARTIFACTS