From 9c96e00692ebc7adf8c8b66f38f16c08c91a888f Mon Sep 17 00:00:00 2001
From: "Auke L. Klazema" <klazema@astron.nl>
Date: Fri, 15 Nov 2019 11:54:02 +0100
Subject: [PATCH] SW-836: Hardcode paths

---
 .gitlab-ci.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a9db6e68aa..6d8c737df7a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,11 +11,10 @@ build_RAServices:
   image: ci_raservices:latest
   script:
     - PACKAGE=RAServices
-    - VARIANT=gnucxx11_opt
     - echo "Building $PACKAGE..."
     - mkdir install
-    - mkdir -p build/$VARIANT
-    - cd build/$VARIANT
+    - mkdir -p build/gnucxx11_opt
+    - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DCMAKE_INSTALL_PREFIX=/opt/lofar -DUSE_LOG4CPLUS=false ../..
     - make
     - make DESTDIR=../../install install
@@ -24,7 +23,7 @@ build_RAServices:
 
   artifacts:
     paths:
-      - build/$VARIANT
+      - build/gnucxx11_opt
       - install/*.ztar
 
 # build_CEP:
@@ -211,9 +210,8 @@ test_RAServices:
   image: ci_raservices:latest
   script:
     - PACKAGE=RAServices
-    - VARIANT=gnucxx11_opt
     - echo "Testing $PACKAGE..."
-    - cd build/$VARIANT
+    - cd build/gnucxx11_opt
     - ctest
   dependencies:
     - build_RAServices
@@ -221,7 +219,7 @@ test_RAServices:
     name: test-report
     when: always
     paths:
-      - build/$VARIANT/Testing/Temporary/LastTest.log
+      - build/gnucxx11_opt/Testing/Temporary/LastTest.log
 
 # test_CEP:
 #   stage: test
-- 
GitLab