summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-09-28 09:37:21 +0200
committerHolger Levsen <holger@layer-acht.org>2014-09-28 09:37:21 +0200
commit6df8b96a75600cb715a16393d34d1bbd595c7e5d (patch)
treee15abf3ae1861b736d1b0f49c0b8444ba6bb495a
parentfc02b5f033995b019cdc21a2d325ecd2720f131b (diff)
downloadjenkins.debian.net-6df8b96a75600cb715a16393d34d1bbd595c7e5d.tar.xz
reproducible: create html output too
-rw-r--r--TODO2
-rwxr-xr-xbin/reproducible_setup.sh4
-rwxr-xr-xbin/reproducible_stats.sh5
-rw-r--r--job-cfg/reproducible.yaml39
4 files changed, 39 insertions, 11 deletions
diff --git a/TODO b/TODO
index 1528dc79..5a6f3126 100644
--- a/TODO
+++ b/TODO
@@ -22,7 +22,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
* keep git+svn urls, and use commit hooks. also better for test setups of this setup as well as overall stability.
** create d-i_svn_trigger job to trigger sub-set jobs (like manual)
** create d-i git hooks
-* get rid of some reduncacy in job-cfg/*.yaml
* fully automate backup and backup /var/lib/jenkins/jobs /var/lib/munin /var/log /root/ too
* try awstats
* put kgb-client.conf in git and sed passwords from filesystem into it...
@@ -38,6 +37,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
=== jenkins-job-builder related
+* get rid of some reduncacy in job-cfg/*.yaml
* this seems to be helpful: http://en.wikipedia.org/wiki/YAML#References (pyyaml which jenkins-job-builder uses supports them)
* FIXME: sometimes true and some True used in yaml files
* support for gitweb in jobs
diff --git a/bin/reproducible_setup.sh b/bin/reproducible_setup.sh
index 6376efec..25570c7f 100755
--- a/bin/reproducible_setup.sh
+++ b/bin/reproducible_setup.sh
@@ -19,7 +19,3 @@ sudo pbuilder --create --basetgz /var/cache/pbuilder/base-reproducible.tgz --dis
sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/base-reproducible.tgz -- ${TMPFILE}
rm ${TMPFILE}
-# the alternative would be to make the job definition more complicated: collecting logs for all jobs but this one and _stats...
-mkdir -p results/_success
-touch results/dummy.log
-touch results/_success/dummy.log
diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh
index aabe7c1c..cf49e125 100755
--- a/bin/reproducible_stats.sh
+++ b/bin/reproducible_stats.sh
@@ -32,7 +32,4 @@ echo
echo "$COUNT_UGLY packages failed to build from source: ${UGLY}"
echo "$COUNT_SOURCELESS packages doesn't exist in sid and need investigation: $SOURCELESS"
-# the alternative would be to make the job definition more complicated: collecting logs for all jobs but this one and _setup...
-mkdir -p results/_success
-touch results/dummy.log
-touch results/_success/dummy.log
+echo "<html><body><p>Hello world</p></body></html>" > inde.html
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index b8d83839..8fbfc27e 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -44,12 +44,47 @@
unstable-on-warning: 'true'
fail-on-error: 'true'
+- defaults:
+ name: reproducible_stats
+ 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} {my_packages}'
+ publishers:
+ - email:
+ recipients: 'jenkins+debian-reproducible holger@layer-acht.org reproducible-commits@lists.alioth.debian.org'
+ - htmlpublisher:
+ name: 'Reproducible builds statistics'
+ directory: '.'
+ indexfiles: 'index.html'
+ keepall: True
+
- job-template:
- defaults: reproducible
+ defaults: reproducible_stats
name: '{name}_setup'
- job-template:
- defaults: reproducible
+ defaults: reproducible_stats
name: '{name}_stats'
- job-template: