diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-09-28 09:55:38 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-09-28 09:55:38 +0200 |
| commit | 2e9d95eb6d884b0fc383a64a255ba95734aed54c (patch) | |
| tree | 6c9d389ae2d31fe5805dd6b7b8751fe11619d561 | |
| parent | 6df8b96a75600cb715a16393d34d1bbd595c7e5d (diff) | |
| download | jenkins.debian.net-2e9d95eb6d884b0fc383a64a255ba95734aed54c.tar.xz | |
reproducible: link all diffp files from stats page
| -rw-r--r-- | TODO | 2 | ||||
| -rwxr-xr-x | bin/reproducible_build.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_stats.sh | 9 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 34 |
4 files changed, 43 insertions, 4 deletions
@@ -99,13 +99,13 @@ general === reproducible -* copy diffp files away and make them accessable and link them from stats.html * use git repo in job config? * use 2 job templates * document this on https://wiki.debian.org/ReproducibleBuilds * investigate packages not in sid from https://jenkins.debian.net/view/reproducible/job/reproducible_build_d-i/lastBuild/console - the list was taken from the jenkins d-i jobs... * pbuilder results cleanup * pbuilder cleanup cache +* cleanup userContent/diffp/ ** graph number of reproducible packages === Test Debian live diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 6c2011f0..30f4feb4 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -93,9 +93,11 @@ for SRCPACKAGE in $PACKAGES ; do set -e cat b1/${SRCPACKAGE}_*.changes mkdir -p results/_success + mkdir -p /var/lib/jenkins/userContent/diffp/ LOGFILE=$(ls ${SRCPACKAGE}_*.dsc) LOGFILE=$(echo ${LOGFILE%.dsc}.diffp) ./misc.git/diffp b1/${SRCPACKAGE}_*.changes b2/${SRCPACKAGE}_*.changes | tee ./results/${LOGFILE} + cp ./results/${LOGFILE} /var/lib/jenkins/userContent/diffp/ if ! $(grep -qv '^\*\*\*\*\*' ./results/${LOGFILE}) ; then mv ./results/${LOGFILE} ./results/_success/ figlet ${SRCPACKAGE} diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh index cf49e125..f1ed81cf 100755 --- a/bin/reproducible_stats.sh +++ b/bin/reproducible_stats.sh @@ -32,4 +32,11 @@ echo echo "$COUNT_UGLY packages failed to build from source: ${UGLY}" echo "$COUNT_SOURCELESS packages doesn't exist in sid and need investigation: $SOURCELESS" -echo "<html><body><p>Hello world</p></body></html>" > inde.html +echo "<html><body><p>Hello World<ul>" > index.html +for PKG in $BAD ; do + VERSION=$(sqlite3 $PACKAGES_DB "SELECT version FROM source_packages WHERE name = \"$PKG\"") + echo "<li><a href=https://$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}>diffp output for $PKG</a></li> " >> index.html +done +echo "</ul></p></body></html>" >> index.html + + diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 8fbfc27e..8c1638df 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -45,6 +45,36 @@ fail-on-error: 'true' - defaults: + name: reproducible_setup + triggers: + - timed: "{my_timed}" + project-type: freestyle + properties: + - sidebar: + url: https://jenkins.debian.net/userContent/about.html + text: About jenkins.debian.net + icon: /userContent/images/debian-swirl-24x24.png + - sidebar: + url: https://jenkins.debian.net/view/reproducible + text: reproducible builds jobs + icon: /userContent/images/debian-jenkins-24x24.png + - sidebar: + url: http://www.profitbricks.com + text: Sponsored by Profitbricks + icon: /userContent/images/profitbricks-24x24.png + description: '{my_description}{my_packages}<br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/reproducible.yaml">reproducible.yaml</a>.' + logrotate: + daysToKeep: 365 + numToKeep: 20 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + builders: + - shell: '{my_shell}' + publishers: + - email: + recipients: 'jenkins+debian-reproducible holger@layer-acht.org reproducible-commits@lists.alioth.debian.org' + +- defaults: name: reproducible_stats triggers: - timed: "{my_timed}" @@ -69,7 +99,7 @@ artifactDaysToKeep: -1 artifactNumToKeep: -1 builders: - - shell: '{my_shell} {my_packages}' + - shell: '{my_shell}' publishers: - email: recipients: 'jenkins+debian-reproducible holger@layer-acht.org reproducible-commits@lists.alioth.debian.org' @@ -80,7 +110,7 @@ keepall: True - job-template: - defaults: reproducible_stats + defaults: reproducible_setup name: '{name}_setup' - job-template: |