Merge branch 'cherry-pick-c31c8f3f' into 'releases/3.4'

Merge branch 'fix/python-ci' into 'master'

See merge request !2732

.gitlab-ci.yml

@@ -106,13 +106,14 @@ full-dune-2.7-clang:
   variables:
     IMAGE: $IMAGE_REGISTRY_URL/full:dune-2.7-clang-ubuntu-20.04
 
-##################################
-# additional scheduled pipelines #
 full-dune-master-gcc:
-  extends: .non-mr-trigger
+  extends: .base-trigger
   variables:
     IMAGE: $IMAGE_REGISTRY_URL/full:dune-master-gcc-ubuntu-20.04
 
+
+##################################
+# additional scheduled pipelines #
 full-dune-master-clang:
   extends: .non-mr-trigger
   variables:

.gitlab-ci/default.yml

 default:
   image: $IMAGE
 
+
 stages:
   - configure
+  - select
   - build
   - test
 
+
 workflow:
   rules:
     - if: $CI_PIPELINE_SOURCE=="parent_pipeline"
 
+
 # variables that should be overwritten by the trigger
 variables:
   MR_TARGET_BRANCH_NAME: ""
   REFERENCE_SHA: ""
 
-select tests:
+
+configure:
   stage: configure
   script:
     - dunecontrol --opts=$DUNE_OPTS_FILE --current all
+    - source bin/testing/ci-setup-python-env.sh
+  artifacts:
+    paths:
+      - build-cmake
+    expire_in: 3 hours
+
+
+select tests:
+  stage: select
+  script:
     - |
       if [[ -n "$MR_TARGET_BRANCH_NAME" ]]; then
           echo "Detecting changes w.r.t to target branch '$MR_TARGET_BRANCH_NAME'"
@@ -44,9 +59,12 @@ select tests:
       fi
   artifacts:
     paths:
-      - build-cmake
       - affectedtests.json
     expire_in: 3 hours
+  needs:
+    - job: configure
+      artifacts: true
+
 
 build dumux:
   stage: build
@@ -66,9 +84,12 @@ build dumux:
       - affectedtests.json
     expire_in: 3 hours
   needs:
+    - job: configure
+      artifacts: true
     - job: select tests
       artifacts: true
 
+
 test dumux:
   stage: test
   variables:
@@ -89,3 +110,19 @@ test dumux:
   artifacts:
     reports:
       junit: junit/dumux-cmake.xml
+
+
+test dumux python:
+  stage: test
+  variables:
+    OMPI_ALLOW_RUN_AS_ROOT: 1
+    OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
+  script:
+    - source bin/testing/ci-setup-python-env.sh
+    - |
+      pushd build-cmake
+        ctest --output-on-failure -L python
+      popd
+  needs:
+    - job: configure
+      artifacts: true

bin/testing/ci-setup-python-env.sh

+#!/bin/bash
+
+if [ -L /dune/bin/setup-python ] && [ -e /dune/bin/setup-python ] ; then
+    dunecontrol bexec "echo -n :\$(pwd)/python >> $(pwd)/pythonpath.txt"
+    export PYTHONPATH=$PYTHONPATH$(cat pythonpath.txt)
+    rm pythonpath.txt
+    setup-python --opts=$DUNE_OPTS_FILE install
+fi

bin/testing/runselectedtests.py

@@ -81,7 +81,7 @@ if __name__ == '__main__':
                         help='set the flags passed to make')
     parser.add_argument('-tf', '--testflags',
                         required=False,
-                        default='-j4 --output-on-failure',
+                        default='-j4 --output-on-failure -LE python',
                         help='set the flags passed to ctest')
     args = vars(parser.parse_args())