Commit cc69209b authored by Timo Koch's avatar Timo Koch
Browse files

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

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

See merge request !2732
parents dca97ab1 d0956ddf
Pipeline #6477 passed with stage
in 21 seconds
...@@ -106,13 +106,14 @@ full-dune-2.7-clang: ...@@ -106,13 +106,14 @@ full-dune-2.7-clang:
variables: variables:
IMAGE: $IMAGE_REGISTRY_URL/full:dune-2.7-clang-ubuntu-20.04 IMAGE: $IMAGE_REGISTRY_URL/full:dune-2.7-clang-ubuntu-20.04
##################################
# additional scheduled pipelines #
full-dune-master-gcc: full-dune-master-gcc:
extends: .non-mr-trigger extends: .base-trigger
variables: variables:
IMAGE: $IMAGE_REGISTRY_URL/full:dune-master-gcc-ubuntu-20.04 IMAGE: $IMAGE_REGISTRY_URL/full:dune-master-gcc-ubuntu-20.04
##################################
# additional scheduled pipelines #
full-dune-master-clang: full-dune-master-clang:
extends: .non-mr-trigger extends: .non-mr-trigger
variables: variables:
......
default: default:
image: $IMAGE image: $IMAGE
stages: stages:
- configure - configure
- select
- build - build
- test - test
workflow: workflow:
rules: rules:
- if: $CI_PIPELINE_SOURCE=="parent_pipeline" - if: $CI_PIPELINE_SOURCE=="parent_pipeline"
# variables that should be overwritten by the trigger # variables that should be overwritten by the trigger
variables: variables:
MR_TARGET_BRANCH_NAME: "" MR_TARGET_BRANCH_NAME: ""
REFERENCE_SHA: "" REFERENCE_SHA: ""
select tests:
configure:
stage: configure stage: configure
script: script:
- dunecontrol --opts=$DUNE_OPTS_FILE --current all - 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 if [[ -n "$MR_TARGET_BRANCH_NAME" ]]; then
echo "Detecting changes w.r.t to target branch '$MR_TARGET_BRANCH_NAME'" echo "Detecting changes w.r.t to target branch '$MR_TARGET_BRANCH_NAME'"
...@@ -44,9 +59,12 @@ select tests: ...@@ -44,9 +59,12 @@ select tests:
fi fi
artifacts: artifacts:
paths: paths:
- build-cmake
- affectedtests.json - affectedtests.json
expire_in: 3 hours expire_in: 3 hours
needs:
- job: configure
artifacts: true
build dumux: build dumux:
stage: build stage: build
...@@ -66,9 +84,12 @@ build dumux: ...@@ -66,9 +84,12 @@ build dumux:
- affectedtests.json - affectedtests.json
expire_in: 3 hours expire_in: 3 hours
needs: needs:
- job: configure
artifacts: true
- job: select tests - job: select tests
artifacts: true artifacts: true
test dumux: test dumux:
stage: test stage: test
variables: variables:
...@@ -89,3 +110,19 @@ test dumux: ...@@ -89,3 +110,19 @@ test dumux:
artifacts: artifacts:
reports: reports:
junit: junit/dumux-cmake.xml 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/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
...@@ -81,7 +81,7 @@ if __name__ == '__main__': ...@@ -81,7 +81,7 @@ if __name__ == '__main__':
help='set the flags passed to make') help='set the flags passed to make')
parser.add_argument('-tf', '--testflags', parser.add_argument('-tf', '--testflags',
required=False, required=False,
default='-j4 --output-on-failure', default='-j4 --output-on-failure -LE python',
help='set the flags passed to ctest') help='set the flags passed to ctest')
args = vars(parser.parse_args()) args = vars(parser.parse_args())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment