From 8b055842bfd60c7281f2489c43ef89ccb56ae09e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 23 Apr 2013 17:05:50 +0200 Subject: [PATCH] Simplification for Jenkins - reports in the same directory level as results. --- mock.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mock.sh b/mock.sh index be533c7..83fc66b 100755 --- a/mock.sh +++ b/mock.sh @@ -57,12 +57,13 @@ esac LAUNCHDIR=`dirname $0` LAUNCHDIR=`(cd $LAUNCHDIR; pwd)` -REPORTS=results/reports +REPORTS=reports CMD="mock --configdir=mock -r $CONF --resultdir `pwd`/$REPORTS" if test "$1" != "clean"; then - mkdir -p $REPORTS 2>/dev/null || : mkdir externals 2>/dev/null || : + mkdir results 2>/dev/null || : + mkdir -p $REPORTS 2>/dev/null || : if test "$CONF" != "pbuilder"; then mkdir mock 2>/dev/null || : ln -s /etc/mock/logging.ini mock/ 2>/dev/null || : @@ -114,7 +115,7 @@ pbuilder_build() { (cd $DIR; dpkg-source -x "`basename $FILE`") SUBDIR=`find $DIR -maxdepth 1 -type d -name ${BASENAME}-\* | head -n 1` (cd $SUBDIR; pdebuild --buildresult $BASEDIR/results/pbuilder --auto-debsign --debsign-k $KEY_ID -- --hookdir $LAUNCHDIR/pbuilder $PBUILDER_OPTS) - mv $DIR/*.build results/reports + mv $DIR/*.build $REPORTS CHANGES=`find results/pbuilder -type f -name ${BASENAME}_\*.changes | head -n 1` # upload invalides the gpg sign rm -f $DEBREPO_MAIN/$DEBDISTRO/Release.gpg -- 1.8.2.3