Merge branch 'ci_eudaq2' into 'master'

CI: Switch do own Docker image

See merge request !171

.gitlab-ci.yml

@@ -76,6 +76,28 @@ cmp:cc7-gcc:
             - lib
         expire_in: 3 hour
 
+cmp:cc7-docker:
+    stage: compilation
+    tags:
+        - docker
+    image:
+        name: gitlab-registry.cern.ch/corryvreckan/corryvreckan/corryvreckan-deps
+        entrypoint: [""]
+    before_script:
+        - source scl_source enable devtoolset-7 || echo " "
+    script:
+        - mkdir build
+        - cd build
+        - cmake3 -DBUILD_EventLoaderEUDAQ2=ON -DCMAKE_BUILD_TYPE=RELEASE -DROOT_DIR=$ROOTSYS ..
+        - make
+        - make install
+    artifacts:
+        paths:
+            - build
+            - bin
+            - lib
+        expire_in: 3 hour
+
 cmp:cc7-llvm:
     stage: compilation
     tags:
@@ -124,10 +146,12 @@ cmp:mac1014-clang:
     tags:
         - docker
     dependencies:
-        - cmp:cc7-gcc
-    image: clicdp/cc7-base
+        - cmp:cc7-docker
+    image:
+        name: gitlab-registry.cern.ch/corryvreckan/corryvreckan/corryvreckan-deps
+        entrypoint: [""]
     before_script:
-        - source .gitlab-ci.d/init_x86_64.sh
+        - source scl_source enable devtoolset-7 || echo " "
 
 tst:telescope:
     extends: .test

testing/run_test.sh

 ABSOLUTE_PATH="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )"
 
-# Load dependencies if run by the CI
-# FIXME: This is needed because of broken RPATH on Mac
-if [ -n "${CI}" ]; then
-    if [ "$(uname)" == "Darwin" ]; then
-        source $ABSOLUTE_PATH/../.gitlab-ci.d/init_mac.sh
-    else
-        source $ABSOLUTE_PATH/../.gitlab-ci.d/init_x86_64.sh
-    fi
-    source $ABSOLUTE_PATH/../.gitlab-ci.d/load_deps.sh
-fi
-
 # First argument is the data set to be used, ask for the download:
 python download_data.py $1
+
 # Second argument is the full test command to be executed:
 exec $2