Skip to content
Snippets Groups Projects
Commit 9c96e006 authored by Auke Klazema's avatar Auke Klazema
Browse files

SW-836: Hardcode paths

parent 751eb46c
No related branches found
No related tags found
1 merge request!86Resolve SW-836
...@@ -11,11 +11,10 @@ build_RAServices: ...@@ -11,11 +11,10 @@ build_RAServices:
image: ci_raservices:latest image: ci_raservices:latest
script: script:
- PACKAGE=RAServices - PACKAGE=RAServices
- VARIANT=gnucxx11_opt
- echo "Building $PACKAGE..." - echo "Building $PACKAGE..."
- mkdir install - mkdir install
- mkdir -p build/$VARIANT - mkdir -p build/gnucxx11_opt
- cd build/$VARIANT - 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 ../.. - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DCMAKE_INSTALL_PREFIX=/opt/lofar -DUSE_LOG4CPLUS=false ../..
- make - make
- make DESTDIR=../../install install - make DESTDIR=../../install install
...@@ -24,7 +23,7 @@ build_RAServices: ...@@ -24,7 +23,7 @@ build_RAServices:
artifacts: artifacts:
paths: paths:
- build/$VARIANT - build/gnucxx11_opt
- install/*.ztar - install/*.ztar
# build_CEP: # build_CEP:
...@@ -211,9 +210,8 @@ test_RAServices: ...@@ -211,9 +210,8 @@ test_RAServices:
image: ci_raservices:latest image: ci_raservices:latest
script: script:
- PACKAGE=RAServices - PACKAGE=RAServices
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..." - echo "Testing $PACKAGE..."
- cd build/$VARIANT - cd build/gnucxx11_opt
- ctest - ctest
dependencies: dependencies:
- build_RAServices - build_RAServices
...@@ -221,7 +219,7 @@ test_RAServices: ...@@ -221,7 +219,7 @@ test_RAServices:
name: test-report name: test-report
when: always when: always
paths: paths:
- build/$VARIANT/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
# test_CEP: # test_CEP:
# stage: test # stage: test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment