Simplification for Jenkins - reports in the same directory level as results.

diff --git a/mock.sh b/mock.sh
index be533c7..83fc66b 100755 (executable)
--- 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