ctest with python3

.gitlab-ci.yml

@@ -2,71 +2,81 @@
 
 default:
     image: rboman/waves
+    before_script:
+        - source /opt/intel/mkl/bin/mklvars.sh intel64
+        - source /opt/intel/tbb/bin/tbbvars.sh intel64
 
 stages:
     - build
-#    - test
+    - test
 
-# full_build:
-#     stage: build
-#     script:
-#         - source /opt/intel/mkl/bin/mklvars.sh intel64
-#         - source /opt/intel/tbb/bin/tbbvars.sh intel64
-#         - printenv | sort
-#         - rm -rf build workspace
-#         - mkdir build
-#         - cd build
-#         - cmake -DUSE_PY3=OFF -Wno-dev ..
-#         - make -j 4
-#     artifacts:
-#         paths:
-#             - build/
-#         expire_in: 1 hour
+build-py2:
+    stage: build
+    script:
+        - printenv | sort
+        - rm -rf build workspace
+        - mkdir build
+        - cd build
+        - cmake -DUSE_PY3=OFF -Wno-dev ..
+        - make -j 4
+    artifacts:
+        paths:
+            - build/
+        expire_in: 1 hour
 
-# build_no_tlnos:
-#     stage: build
-#     script:
-#         - source /opt/intel/mkl/bin/mklvars.sh intel64
-#         - source /opt/intel/tbb/bin/tbbvars.sh intel64
-#         - printenv | sort
-#         - rm -rf build workspace
-#         - mkdir build
-#         - cd build
-#         - cmake -DUSE_PY3=OFF -Wno-dev -C ../CMake/disable-trilinos.cmake ..
-#         - make -j 4
+build-py2-no-tlnos:
+    stage: build
+    script:
+        - printenv | sort
+        - rm -rf build workspace
+        - mkdir build
+        - cd build
+        - cmake -DUSE_PY3=OFF -Wno-dev -C ../CMake/disable-trilinos.cmake ..
+        - make -j 4
 
 build-py3:
     image: rboman/waves-py3
     stage: build
     script:
-        - source /opt/intel/mkl/bin/mklvars.sh intel64
-        - source /opt/intel/tbb/bin/tbbvars.sh intel64
         - printenv | sort
         - rm -rf build workspace
         - mkdir build
         - cd build
         - cmake -Wno-dev -C ../CMake/disable-trilinos.cmake ..
         - make -j 4
-                   
-# doxygen:
-#     stage: test
-#     script:
-#         - cd build
-#         - make dox
-#     artifacts:
-#         paths:
-#             - build/doxygen/
-#         expire_in: 1 day
-                  
-# ctest:
-#     stage: test
-#     script:
-#         - source /opt/intel/mkl/bin/mklvars.sh intel64
-#         - source /opt/intel/tbb/bin/tbbvars.sh intel64
-#         - cd build
-#         - ctest -j 4 #--verbose
-    #timeout: 10 hours  # will be available in 12.3
+    artifacts:
+        paths:
+            - build/
+        expire_in: 1 hour
+    
+doxygen:
+    stage: test
+    script:
+        - cd build
+        - make dox
+    artifacts:
+        paths:
+            - build/doxygen/
+        expire_in: 1 day
+    dependencies:
+        - build-py2
 
+ctest-py2:
+    stage: test
+    script:
+        - cd build
+        - ctest -j 4 #--verbose
+    #timeout: 10 hours  # will be available in 12.3
+    dependencies:
+        - build-py2
 
+ctest-py3:
+    stage: test
+    script:
+        - cd build
+        - ctest -j 4 #--verbose
+    dependencies:
+        - build-py3
+