diff --git a/cmake/scripts/create_lcg_view.py b/cmake/scripts/create_lcg_view.py index 2ae0a0eeefe0338358329d4bcb1c0f1088c3376b..707d1febff95c04fc982e7ad48fa59169248b8c8 100755 --- a/cmake/scripts/create_lcg_view.py +++ b/cmake/scripts/create_lcg_view.py @@ -34,7 +34,7 @@ class LCGViewMaker(object): def __init__(self, lcgpath, lcgrel, lcgplat, pkgfile, view_destination, blacklist, greylist, pkg_blacklist, dry_run, prioritylist): super(LCGViewMaker, self).__init__() - self.lcg_root = lcgpath + self.lcg_root = lcgpath.rstrip('/') # do not end with a '/' self.lcg_release = lcgrel self.lcg_platform = lcgplat self.lcg_naked_platform = self.get_naked_platform(lcgplat) @@ -471,7 +471,7 @@ This package creates a "view" of LCG release in folder <view_destination>. max(logging.DEBUG, getattr(logging, args.loglvl.upper()) - args.verbose_level * 10 + args.quiet_level * 10)) - logging.basicConfig(format=u'*** %(levelname)s: %(message)s', level=loglvl) + logging.basicConfig(format=u'*** %(levelname)s: %(message)s', level=loglvl, stream=sys.stdout) # print "Logging config: {0} + {1} - {2} = {3}".format(args.loglvl.upper(), args.verbose_level * 10, # args.quiet_level * 10, logging.getLevelName(loglvl)) diff --git a/jenkins/cvmfs_install.sh b/jenkins/cvmfs_install.sh index 95d5c5e3dbdbfd183e0d6d569ac5d738b9b90a3e..eacbcb4c59b0bf604ff08ce8d30944f9d293a6e4 100755 --- a/jenkins/cvmfs_install.sh +++ b/jenkins/cvmfs_install.sh @@ -70,7 +70,7 @@ if [[ "${BUILDMODE}" == "nightly" ]]; then $WORKSPACE/lcgcmake/jenkins/extract_LCG_summary.py /cvmfs/sft-nightlies.cern.ch/lcg/nightlies/${LCG_VERSION}/$weekday $PLATFORM ${LCG_VERSION} RELEASE if [ -f "/cvmfs/sft-nightlies.cern.ch/lcg/nightlies/${LCG_VERSION}/$weekday/isDone-$PLATFORM" ] && [ xtrue = "x${VIEWS_CREATION}" ]; then echo "The installation of the nightly is completed with all packages, let's go for the view creation" - $WORKSPACE/lcgcmake/cmake/scripts/create_lcg_view.py -l /cvmfs/sft-nightlies.cern.ch/lcg/nightlies/ -r ${LCG_VERSION} -p $PLATFORM -d -B /cvmfs/sft-nightlies.cern.ch/lcg/views/${LCG_VERSION}/$weekday/$PLATFORM + $WORKSPACE/lcgcmake/cmake/scripts/create_lcg_view.py -l /cvmfs/sft-nightlies.cern.ch/lcg/nightlies/ -r ${LCG_VERSION} -p $PLATFORM -d -B /cvmfs/sft-nightlies.cern.ch/lcg/views/${LCG_VERSION}/$weekday/$PLATFORM --conflict pytimber if [ "\$?" == "0" ]; then echo "View created, updating latest symlink" rm -f /cvmfs/sft-nightlies.cern.ch/lcg/views/${LCG_VERSION}/latest/$PLATFORM