diff options
| -rwxr-xr-x | bin/chroot-run.sh | 12 | ||||
| -rw-r--r-- | job-cfg/piuparts.yaml | 55 | ||||
| -rw-r--r-- | logparse/debian.rules | 5 |
3 files changed, 63 insertions, 9 deletions
diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh index fc8472a3..c79a8b59 100755 --- a/bin/chroot-run.sh +++ b/bin/chroot-run.sh @@ -87,6 +87,17 @@ cleanup() { publish_changes_to_userContent $CHANGES debian-edu "git ${GIT_COMMIT:0:7}" fi + # + # publish artifacts + # + if $ARTIFACTS ; then + CHANGES=$(ls -1 $CHROOT_TARGET/tmp/*_*.changes 2>/dev/null|| true) + dcmd cp $CHANGES $WORKSPACE/ + fi + + # + # actually cleanup + # if [ -d $CHROOT_TARGET/proc ]; then sudo umount -l $CHROOT_TARGET/proc || fuser -mv $CHROOT_TARGET/proc fi @@ -96,6 +107,7 @@ cleanup() { if [ -d $CHROOT_TARGET ]; then sudo rm -rf --one-file-system $CHROOT_TARGET || fuser -mv $CHROOT_TARGET fi + } trap cleanup INT TERM EXIT diff --git a/job-cfg/piuparts.yaml b/job-cfg/piuparts.yaml index 486c0924..b748811f 100644 --- a/job-cfg/piuparts.yaml +++ b/job-cfg/piuparts.yaml @@ -25,19 +25,19 @@ url: 'git://anonscm.debian.org/piuparts/piuparts.git' branches: - develop - builders: - - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' - job-template: defaults: piuparts - name: '{name}_jessie' + name: '{name}_testsuite_jessie' publishers: - email: recipients: 'jenkins+debian-qa holger@layer-acht.org piuparts-devel@lists.alioth.debian.org' + builders: + - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' - job-template: defaults: piuparts - name: '{name}_sid' + name: '{name}_testsuite_sid' triggers: - pollscm: '*/6 * * * *' publishers: @@ -45,17 +45,54 @@ recipients: 'jenkins+debian-qa holger@layer-acht.org piuparts-devel@lists.alioth.debian.org' - trigger: project: '{my_trigger}' + builders: + - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' + +- job-template: + defaults: piuparts + name: '{name}_build_jessie' + publishers: + - email: + recipients: 'jenkins+debian-qa holger@layer-acht.org piuparts-devel@lists.alioth.debian.org' + - archive: + artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes' + latest_only: true + builders: + - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' + +- job-template: + defaults: piuparts + name: '{name}_build_sid' + publishers: + - email: + recipients: 'jenkins+debian-qa holger@layer-acht.org piuparts-devel@lists.alioth.debian.org' + - trigger: + project: '{my_trigger}' + - archive: + artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes' + latest_only: true + builders: + - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' - project: name: piuparts jobs: - - '{name}_sid': + - '{name}_testsuite_sid': my_distro: 'sid' my_shell: 'make check' - my_description: 'piuparts testsuite running on sid.' - my_trigger: 'piuparts_jessie' - - '{name}_jessie': + my_description: 'run testsuite from piuparts develop branch on sid.' + my_trigger: 'piuparts_testsuite_jessie, piuparts_build_sid' + - '{name}_testsuite_jessie': my_distro: 'jessie' my_shell: 'make check' - my_description: 'piuparts testsuite running on jessie.' + my_description: 'run testsuite from piuparts develop branch on jessie.' + - '{name}_build_sid': + my_distro: 'sid' + my_shell: 'debuild -uc -us' + my_description: 'build the piuparts develop branch on sid.' + my_trigger: 'piuparts_build_jessie' + - '{name}_build_jessie': + my_distro: 'jessie' + my_shell: 'debuild -uc -us' + my_description: 'build the piuparts develop branch on jessie.' diff --git a/logparse/debian.rules b/logparse/debian.rules index dc521871..713ad894 100644 --- a/logparse/debian.rules +++ b/logparse/debian.rules @@ -9,6 +9,11 @@ error /(?i)^error / warning /[Ww]arning/ warning /WARNING/ +# catch lintian warnings and errors +warning /^W: / +warning /^E: / + + # create a quick access link to lines in the report containing 'INFO' info /INFO/ |