From baa1341076e5da36c0c6ec5438f88c8d71e636d4 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 12 Nov 2012 10:59:56 +0100 Subject: also detect existing jobs which should exist --- bin/d-i_check_jobs.sh | 19 ++++++++++++++----- job-cfg/d-i.yaml | 5 +++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/bin/d-i_check_jobs.sh b/bin/d-i_check_jobs.sh index be33af5d..dd149abd 100755 --- a/bin/d-i_check_jobs.sh +++ b/bin/d-i_check_jobs.sh @@ -26,10 +26,11 @@ TMPFILE=$(mktemp) # echo "Scanning $URL for reffered git repos which have no jenkins job associated." curl $URL > $TMPFILE 2>/dev/null -for PACKAGE in $( grep git.debian.org/git/d-i $TMPFILE|cut -d "/" -f6-) ; do - # - # check if a jenkins job exists - # +PACKAGES=$( grep git.debian.org/git/d-i $TMPFILE|cut -d "/" -f6-) +# +# check for each git repo if a jenkins job exists +# +for PACKAGE in $PACKAGES ; do if [ ! -d ~jenkins/jobs/${DI_JOBPATTERN}${PACKAGE} ] ; then echo "Warning: No build job '${DI_JOBPATTERN}${PACKAGE}'." FAIL=true @@ -37,7 +38,14 @@ for PACKAGE in $( grep git.debian.org/git/d-i $TMPFILE|cut -d "/" -f6-) ; do echo "Ok: Job '${DI_JOBPATTERN}${PACKAGE}' exists." fi done -echo +# +# check for each job if there still is a git repo +# +for JOB in $(ls -1 ~jenkins/jobs/ | grep ${DI_JOBPATTERN}) ; do + REPONAME=${JOB:10} + grep -q git+ssh://git.debian.org/git/d-i/$REPONAME $TMPFILE || echo "Warning: Git repo $REPONAME not found in $URL, but job $JOB exists." +done +# cleanup rm $TMPFILE # @@ -49,6 +57,7 @@ echo "Warning: check for missing d-i manual build jobs not implemented" # # fail this job if missing d-i jobs are detected # +echo if $FAIL ; then figlet "Missing jobs!" exit 1 diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml index 9e79f59f..efd11e6a 100644 --- a/job-cfg/d-i.yaml +++ b/job-cfg/d-i.yaml @@ -116,6 +116,11 @@ - shell: '/srv/jenkins/bin/d-i_check_jobs.sh' triggers: - pollscm: "23 0 * * *" + publishers: + - logparser: + rulespath: '/srv/jenkins/logparse/debian.rules' + unstable_on_warning: 'true' + fail_on_error: 'true' - job-template: defaults: d-i-manual -- cgit v1.2.3-54-g00ecf