diff --git a/alice/gen-sim/alice-dpgsim-bmk/OCDBrec.root b/alice/gen-sim/alice-dpgsim-bmk/OCDBrec.root deleted file mode 100644 index cb7b16b7dc2bdd741a05200bd0f87e57072ea305..0000000000000000000000000000000000000000 Binary files a/alice/gen-sim/alice-dpgsim-bmk/OCDBrec.root and /dev/null differ diff --git a/alice/gen-sim/alice-dpgsim-bmk/OCDBsim.root b/alice/gen-sim/alice-dpgsim-bmk/OCDBsim.root deleted file mode 100644 index 4a4ef5dd41f4516e791c9c0a6a5c8d0d85eb1ebc..0000000000000000000000000000000000000000 Binary files a/alice/gen-sim/alice-dpgsim-bmk/OCDBsim.root and /dev/null differ diff --git a/build-executor/main.sh b/build-executor/main.sh index 0b932b0d011a24e10e461dcbff0f49e36f8b74ae..99f0088091d7b9d57c80571f7e2a872f0bea28f8 100755 --- a/build-executor/main.sh +++ b/build-executor/main.sh @@ -1,7 +1,5 @@ #!/bin/bash -set -x # enable debug printouts - #set -e # immediate exit on error @@ -327,7 +325,7 @@ export DOCKER_BASE_IMAGE='gitlab-registry.cern.ch/cloud-infrastructure/cloud-ben # 1: SPEC file path # 2: optional export DOCKER_REGISTRY gitlab-registry.cern.ch/giordano/hep-workloads -while getopts "hs:r:e:m" o; do +while getopts "hds:r:e:m" o; do case ${o} in s) [ "$OPTARG" != "" ] && export HEP_WL_SPEC_FILE="$OPTARG" @@ -341,8 +339,11 @@ while getopts "hs:r:e:m" o; do m) MOUNT_CVMFS=1 ;; + d) + set -x # enable debug printouts + ;; h) - echo "usage: $0 -s <full path to HEP Workload Spec file> [-r <docker registry>] [-e <event from which to start (all|shrink|build|sleep|none): default is all>]" + echo "usage: $0 -s <full path to HEP Workload Spec file> [-r <docker registry>] [-e <event from which to start (all|shrink|build|sleep|none): default is all>] [-d (enable debug printouts)]" exit 1 ;; esac diff --git a/build-executor/run_build.sh b/build-executor/run_build.sh index a04d7747d375e959b97ecda04c898e7f4d06fd21..33d3a053d3c95e69db76bc9796b303f2e37be282 100755 --- a/build-executor/run_build.sh +++ b/build-executor/run_build.sh @@ -1,7 +1,6 @@ #!/bin/bash -set -x # enable debug printouts - +#set -x # enable debug printouts #set -e # immediate exit on error SCRIPT_DIR=`dirname $0` @@ -30,18 +29,41 @@ DOCK_CVMFS="/var/lib/cvmfs" WL_SPEC="${WL_DIR}/cms/gen-sim/cms-ttbar.spec" BUILD_EVENT="all" -[[ "$1" != "" ]] && WL_SPEC="$1" -[[ "$2" != "" ]] && BUILD_EVENT="$2" +while getopts "hs:e:d" o; do + case ${o} in + s) + [ "$OPTARG" != "" ] && export WL_SPEC="$OPTARG" + ;; + e) + [ "$OPTARG" != "" ] && export BUILD_EVENT="$OPTARG" + ;; + d) + set -x # enable debug printouts + ;; + h) + echo "usage: $0 -s <full path to HEP Workload Spec file> [-e <event from which to start (all|shrink|build|sleep|none): default is all>]" + exit 1 + ;; + esac +done + UUID=$(date +"%Y-%m-%d-%H-%M-%S")_$(((RANDOM%100)+1)) CVMFS_VOLUME=/scratch/cvmfs_hep/cvmfs_hep_$UUID -umount $CVMFS_VOLUME/* -rm -rf $CVMFS_VOLUME/* + +if [ -e "$CVMFS_VOLUME" ]; then + umount $CVMFS_VOLUME/* + rm -rf $CVMFS_VOLUME/* +fi JOB_DIR=/scratch/logs/hep_builder_$UUID mkdir -p $JOB_DIR + +echo -e "\n\n\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" echo JOB_DIR is $JOB_DIR echo CVMFS_VOLUME is $CVMFS_VOLUME +echo -e "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n\n\n" + echo "running privileged docker with fixed entrypoint" docker run --rm --privileged --entrypoint=/root/main.sh \