Commit 5fe48dbf authored by Maciej Szymanski's avatar Maciej Szymanski
Browse files

use docker only to build

parent 5561123f
Pipeline #1015431 passed with stage
in 2 minutes and 14 seconds
......@@ -81,4 +81,4 @@ git init ${WORKSPACE}/tmp/container
)
set -x
$cmd --${os_label} $1
$cmd --${os_label} bash -c "source /cvmfs/lhcb.cern.ch/lib/LbEnv-testing ; export PYTHONPATH=${WORKSPACE}/python:$PYTHONPATH ; $* "
......@@ -68,9 +68,10 @@ if [ ! -d $WORKSPACE ] ; then
mkdir -p $WORKSPACE
fi
cd $WORKSPACE
# cd $WORKSPACE
cmd=$PWD/jenkins/${step}.sh
exec ${scripts_dir}/docker.sh $cmd
# cmd=$PWD/jenkins/${step}.sh
# exec ${scripts_dir}/docker.sh $cmd
./jenkins/${step}.sh
#EOF
......@@ -84,7 +84,8 @@ build_slot flavour slot slot_build_id platform
mkdir -pv $DISTCC_DIR
fi
local config_file=${directory}/slot-config.json
# local config_file=${directory}/slot-config.json
local config_file=${ARTIFACTS_DIR}/slot-config.json
if [[ "${slot}" = lhcb-coverity ]] ; then
coverity_opt='--coverity --no-ccache'
......@@ -110,14 +111,14 @@ build_slot flavour slot slot_build_id platform
# tel ccache to call the compiler on the files and not on the preprocessed version
export CCACHE_CPP2=yes
time lbn-build ${loglevel_opt} \
${scripts_dir}/docker.sh time lbn-build ${loglevel_opt} \
--build-id "${slot}.${slot_build_id}" \
--artifacts-dir "${directory}" \
--artifacts-dir "./artifacts/${slot_build_id}" \
--clean \
${submit_opt} \
${rsync_opt} \
${coverity_opt} \
${config_file}
"./artifacts/${slot_build_id}/slot-config.json"
if [ -e build/.ccache ] ; then
if which ccache &>/dev/null ; then
......
......@@ -71,12 +71,14 @@ set_common [--build] [--test]"
EOS_MGM_URL=${EOS_BASE_URL} eos mkdir -p ${EOS_ARTIFACTS_DIR}/ccache
fi
# clean up possible stale files
rm -rf artifacts build tmp
if [[ "${special_config}" == "true" && $(pwd) != "/workspace" && "${NODE_LABELS}" == *docker* ]] ; then
exec ${scripts_dir}/docker.sh "$0"
if [[ "$JENKINS_MOCK" != "true" ]] ; then
# clean up possible stale files
rm -rf artifacts build tmp
fi
# if [[ "${special_config}" == "true" && $(pwd) != "/workspace" && "${NODE_LABELS}" == *docker* ]] ; then
# exec ${scripts_dir}/docker.sh "$0"
# fi
set +x
export CMTCONFIG=${platform}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment