Merge branch 'master' into 'advanced_streaming_extensions'

# Conflicts:
#   .gitlab-ci.yml

.gitlab-ci.yml

@@ -99,22 +99,19 @@ 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/
@@ -123,6 +120,7 @@ pycodegen-integration:
     - make -j $NUM_CORES
     - cd ../UniformGridGenerated
     - make -j $NUM_CORES
+
   tags:
     - docker
     - cuda11