From 2f209771e0fde45ae936fc6acd6c6ce2b25f9b95 Mon Sep 17 00:00:00 2001
From: jkuensem <jkuensem@physik.uni-bielefeld.de>
Date: Thu, 10 Oct 2019 09:37:18 +0200
Subject: [PATCH] SW-394: Run cmake to run correct tests in Gitlab CI
---
.gitlab-ci.yml | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99a9d543b71..06ab1818f95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ build_LCS:
- echo "Building $PACKAGE..."
- mkdir -p build/$VARIANT
- cd build/$VARIANT
- #- docker run -d -v ~/wincc:/opt/wincc wincc:lates # todo: set correct path and wincc image
+ - docker run -d -v ~/WinCC-OA/3.15/:/opt/WinCC-OA/3.15/ wincc:latest # todo: set correct path and wincc image
- cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.15/ ../..
- make
@@ -103,7 +103,7 @@ build_MAC:
- echo "Building $PACKAGE..."
- mkdir -p build/$VARIANT
- cd build/$VARIANT
- #- docker run -d -v ~/wincc:/opt/wincc wincc:latest # todo: set correct path and wincc image
+ - docker run -d -v ~/WinCC_OA/3.15/:/opt/WinCC_OA/3.15/ wincc:latest # todo: set correct path and wincc image
- cmake -DCASACORE_ROOT_DIR=/opt/casacore/ -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.15/ -DBLITZ_ROOT_DIR=/opt/blitz/ -DBUILD_PACKAGES=$PACKAGE ../..
- make
@@ -185,7 +185,7 @@ build_SAS:
#
# TEST STAGE
#
-# TODO: I guess we have to run cmake before each of these so ctest tests the correct package...
+# TODO: We should play around with the variable expansion on Gitlab CI a bit more to find a usable way to refer to the cmake line from the build step
test_CEP:
@@ -196,6 +196,7 @@ test_CEP:
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
- cd build/$VARIANT
+ - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ ../..
- ctest
@@ -207,6 +208,7 @@ test_Docker:
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
- cd build/$VARIANT
+ - cmake -DBUILD_PACKAGES=$PACKAGE ../..
- ctest
@@ -217,6 +219,7 @@ test_LCS:
- PACKAGE=LCS
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
+ - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.15/ ../..
- cd build/$VARIANT
- ctest
@@ -229,6 +232,7 @@ test_LCU:
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
- cd build/$VARIANT
+ - cmake -DBUILD_PACKAGES=$PACKAGE ../..
- ctest
@@ -240,6 +244,7 @@ test_LTA:
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
- cd build/$VARIANT
+ - cmake -DBUILD_PACKAGES=$PACKAGE ../..
- ctest
@@ -251,6 +256,7 @@ test_MAC:
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
- cd build/$VARIANT
+ - cmake -DCASACORE_ROOT_DIR=/opt/casacore/ -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.15/ -DBLITZ_ROOT_DIR=/opt/blitz/ -DBUILD_PACKAGES=$PACKAGE ../..
- ctest
@@ -262,6 +268,7 @@ test_QA:
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
- cd build/$VARIANT
+ - cmake -DBUILD_PACKAGES=$PACKAGE ../..
- ctest
@@ -273,6 +280,7 @@ test_RTCP:
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
- cd build/$VARIANT
+ - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DDAL_ROOT_DIR=/opt/DAL/ -DUSE_MPI=True -DUSE_OPENMP=True ../..
- ctest
@@ -284,4 +292,5 @@ test_SAS:
- VARIANT=gnucxx11_opt
- echo "Testing $PACKAGE..."
- cd build/$VARIANT
+ - cmake -DBUILD_PACKAGES=$PACKAGE ../..
- ctest
\ No newline at end of file
--
GitLab