diff --git a/build-any-ib.sh b/build-any-ib.sh index 25de710a..5a2aa32f 100755 --- a/build-any-ib.sh +++ b/build-any-ib.sh @@ -16,7 +16,7 @@ which lsb_release > /dev/null 2>&1 && lsb_release -a uname -a date -BUILD_DATE=$(echo 2015$(echo "$(date -u +%s) / (86400 * 3)" | bc)) +BUILD_DATE=$(echo 2015$(($(echo "$(date -u +%s) / (86400 * 3)")))) MIRROR=mirror diff --git a/build-package b/build-package index f2199f06..e8c680ce 100755 --- a/build-package +++ b/build-package @@ -10,7 +10,7 @@ case "$ALIDIST_SLUG" in *) ALIDIST_REPO=$ALIDIST_SLUG ;; esac -BUILD_DATE=$(echo 2015$(echo "$(date -u +%s) / (86400 * 3)" | bc)) +BUILD_DATE=$(echo 2015$(($(echo "$(date -u +%s) / (86400 * 3)")))) MIRROR=mirror diff --git a/daq-da-rpms.sh b/daq-da-rpms.sh deleted file mode 100755 index 6a31229c..00000000 --- a/daq-da-rpms.sh +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash -ex -set -o pipefail - -# Check for required variables -for V in ALIDIST_REPO ALIBUILD_REPO ALIROOT_VERSION NODE_NAME; do - [[ $(eval echo \$$V) ]] || { echo "Required variable $V not defined!"; ERR=1; continue; } - eval "export $V" -done -[[ $ERR == 1 ]] && exit 1 || true - -ALIBUILD_BRANCH=${ALIBUILD_REPO##*:} -ALIBUILD_REPO=${ALIBUILD_REPO%:*} -ALIDIST_BRANCH=${ALIDIST_REPO##*:} -ALIDIST_REPO=${ALIDIST_REPO%:*} -OVERRIDE_TAGS="AliRoot=$ALIROOT_VERSION" -DEFAULTS=daq -REMOTE_STORE=b3://alibuild-repo -YUM_DISABLEREPO=rpmforge,epel,cernvm - -function getver() { - local PKGVER - PKGVER=$(yum ${YUM_DISABLEREPO:+--disablerepo $YUM_DISABLEREPO} info $1 | grep ^Version | cut -d: -f2 | xargs -I{} echo $1_{}) - [[ $PKGVER ]] && echo $PKGVER || echo ERROR -} - -cat > /etc/yum.repos.d/yum-alice-daq.slc6_64.repo < /dev/null - git diff -popd &> /dev/null - -BUILD_DATE=$(echo 2015$(echo "$(date -u +%s) / (86400 * 3)" | bc)) - -MIRROR=/build/mirror -WORKAREA=/build/workarea/sw/$BUILD_DATE -WORKAREA_INDEX=0 - -CURRENT_SLAVE=unknown -while [[ "$CURRENT_SLAVE" != '' ]]; do - WORKAREA_INDEX=$((WORKAREA_INDEX+1)) - CURRENT_SLAVE=$(cat $WORKAREA/$WORKAREA_INDEX/current_slave 2> /dev/null || true) - [[ "$CURRENT_SLAVE" == "$NODE_NAME" ]] && CURRENT_SLAVE= -done - -mkdir -p $WORKAREA/$WORKAREA_INDEX -echo $NODE_NAME > $WORKAREA/$WORKAREA_INDEX/current_slave - -# AliRoot in development mode. Prevents unnecessarily creating/uploading tarball -# by still allowing ROOT build to be cached -rm -rf AliRoot/ -aliBuild --reference-sources $MIRROR \ - --defaults $DEFAULTS \ - init AliRoot - -FETCH_REPOS="$(aliBuild build --help | grep fetch-repos || true)" -aliBuild --reference-sources $MIRROR \ - --debug \ - --work-dir $WORKAREA/$WORKAREA_INDEX \ - --architecture $ARCHITECTURE \ - --jobs ${JOBS:-8} \ - ${FETCH_REPOS:+--fetch-repos} \ - --remote-store $REMOTE_STORE::rw \ - --defaults $DEFAULTS \ - build AliRoot || BUILDERR=$? - -rm -f $WORKAREA/$WORKAREA_INDEX/current_slave -[[ "$BUILDERR" != '' ]] && exit $BUILDERR - -ALIROOT_PREFIX=$(alienv -w $WORKAREA/$WORKAREA_INDEX setenv AliRoot/latest -c sh -c 'echo $ALICE_ROOT') -rsync -av $ALIROOT_PREFIX/darpms/x86_64/ $REMOTE_STORE/RPMS/DAQ/$ARCHITECTURE/