Avoid moving around the build directory

.gitlab-ci.yml

@@ -5,9 +5,9 @@ stages:
 
 before_script:
   - export BINARY_TAG=x86_64-slc6-gcc62-opt
+  - export LCG_hostos=x86_64-slc6
   - export PATH=/cvmfs/sft.cern.ch/lcg/contrib/CMake/3.7.0/Linux-x86_64/bin:/cvmfs/sft.cern.ch/lcg/contrib/ninja/1.7.1/x86_64-slc6:/cvmfs/sft.cern.ch/lcg/releases/Python/2.7.13-597a5/${BINARY_TAG}/bin:${PATH}
   - export LCG_release_area=/cvmfs/sft.cern.ch/lcg/releases
-  - export LCG_hostos=x86_64-slc6
   - export PATH=/cvmfs/lhcb.cern.ch/lib/lhcb/LBSCRIPTS/dev/InstallArea/scripts:${PATH}
   - export CMAKE_PREFIX_PATH=/cvmfs/sft.cern.ch/lcg/releases:/cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2017/vtune_amplifier_xe
   - export CCACHE_DIR=${PWD}/.ccache
@@ -20,9 +20,8 @@ build:
     - unzip -q artifacts.zip '.ccache/*' || true
     - /cvmfs/sft.cern.ch/lcg/releases/ccache/3.3.4-e92e5/${BINARY_TAG}/bin/ccache -z
     - echo 'set(CMAKE_USE_CCACHE ON CACHE BOOL "")' >> cache_preload.cmake
-    - make
+    - make BUILDDIR=build
     - /cvmfs/sft.cern.ch/lcg/releases/ccache/3.3.4-e92e5/${BINARY_TAG}/bin/ccache -s
-    - mv build.${BINARY_TAG} build
   artifacts:
     paths:
       - build
@@ -33,11 +32,10 @@ doxygen:
   image: lhcbdev/slc6-build-cvmfs:latest
   stage: test
   script:
-    - mv build build.${BINARY_TAG}
-    - make doc
+    - make BUILDDIR=build doc
     - rm -rf public
     - mkdir -p public
-    - mv build.${BINARY_TAG}/doxygen/html ${CI_BUILD_REF_NAME}
+    - mv build/doxygen/html ${CI_BUILD_REF_NAME}
     - yum install -y zip
     - zip -r public/${CI_BUILD_REF_NAME}.zip ${CI_BUILD_REF_NAME}
   only:
@@ -52,9 +50,8 @@ test:
   image: lhcbdev/slc6-build-cvmfs:latest
   stage: test
   script:
-    - mv build build.${BINARY_TAG}
-    - make test ARGS='-j4'
-    - mv build.${BINARY_TAG}/html test_report
+    - make BUILDDIR=build test ARGS='-j4'
+    - mv build/html test_report
   artifacts:
     paths:
       - test_report

Makefile

@@ -95,7 +95,7 @@ ifneq ($(USE_NINJA),)
 else
   BUILD_CONF_FILE := Makefile
 endif
-BUILD_CMD := $(CMAKE) --build build.$(BINARY_TAG) --target
+BUILD_CMD := $(CMAKE) --build $(BUILDDIR) --target
 
 # default target
 all: