From fb514f53f5b1cd804b7e053d2a8f9dd475a4641f Mon Sep 17 00:00:00 2001
From: Markus Holzer <markus.holzer@fau.de>
Date: Tue, 3 Nov 2020 07:19:24 +0100
Subject: [PATCH] Fixed integration pipeline
---
.gitlab-ci.yml | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf122614..86b33ed6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,25 +99,26 @@ pycodegen-integration:
when: manual
allow_failure: false
script:
- # run lbmpy long test pipeline
- - export NUM_CORES=$(nproc --all)
- - mkdir -p ~/.config/matplotlib
- - echo "backend:template" > ~/.config/matplotlib/matplotlibrc
- - pip install git+https://gitlab-ci-token:${CI_JOB_TOKEN}@i10git.cs.fau.de/pycodegen/pystencils.git@master#egg=pystencils
- - py.test -v -n $NUM_CORES --cov-report html --cov-report term --cov=.
- # change path to outside of lbmpy and call pip to set the environment variable right
- - cd ..
- - pip install -e lbmpy
- # fetch pycodegen repository with waLberla as submodule and install waLBerla to run the integration tests
- git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@i10git.cs.fau.de/pycodegen/pycodegen.git
- cd pycodegen
- git submodule sync --recursive
- git submodule update --init --recursive
- git submodule foreach git fetch origin # compare the latest master version!
- git submodule foreach git reset --hard origin/master
+ - cd lbmpy
+ - git remote add test $CI_REPOSITORY_URL
+ - git fetch test
+ - git reset --hard $CI_COMMIT_SHA
+ - cd ..
+ - pip install -e pystencils/
+ - pip install -e lbmpy/
- ./install_walberla.sh
- # build all integration tests
- - cd walberla/build/
+ - export NUM_CORES=$(nproc --all)
+ - mkdir -p ~/.config/matplotlib
+ - echo "backend:template" > ~/.config/matplotlib/matplotlibrc
+ - cd ../lbmpy
+ - py.test -v -n $NUM_CORES .
+ - cd ../walberla/build/
- make CodegenJacobiCPU CodegenJacobiGPU CodegenPoissonCPU CodegenPoissonGPU MicroBenchmarkGpuLbm LbCodeGenerationExample UniformGridBenchmarkGPU_trt UniformGridBenchmarkGPU_entropic_kbc_n4
- cd apps/benchmarks/UniformGridGPU
- make -j $NUM_CORES
--
GitLab