Commit beca0aeb authored by Dennis Gläser's avatar Dennis Gläser Committed by Dennis Gläser
Browse files

[ci] adapt to images from docker-ci repository

parent 635dc360
stages: stages:
- trigger pipelines - trigger pipelines
variables:
IMAGE_REGISTRY_URL: $CI_REGISTRY/dumux-repositories/dumux-docker-ci
# rules for the default triggers: # rules for the default triggers:
# - pipelines are triggered for commits to master, tags, merge requests # - pipelines are triggered for commits to master, tags, merge requests, external triggers
# - Within merge requests, we require to start the pipeline manually # - Within merge requests, we require to start the pipeline manually by clicking play for the trigger
# by clicking play for the trigger
.default-trigger: .default-trigger:
stage: trigger pipelines stage: trigger pipelines
trigger: trigger:
...@@ -17,12 +19,7 @@ stages: ...@@ -17,12 +19,7 @@ stages:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: manual when: manual
debian11-gcc9-cpp20: full-dune-2.7-gcc:
extends: .default-trigger
variables:
IMAGE: registry.dune-project.org/docker/ci/dune:2.7-debian-11-gcc-9-20
ubuntu18.04-clang6-cpp17:
extends: .default-trigger extends: .default-trigger
variables: variables:
IMAGE: registry.dune-project.org/docker/ci/dune:2.7-ubuntu-18.04-clang-6-17 IMAGE: $IMAGE_REGISTRY_URL/full:dune-2.7-gcc-ubuntu-20.04
default: default:
image: $IMAGE image: $IMAGE
cache:
key: ${CI_COMMIT_REF_SLUG}-$IMAGE
paths:
- dep_modules
stages: stages:
- build - build
- test - test
...@@ -17,39 +12,31 @@ workflow: ...@@ -17,39 +12,31 @@ workflow:
build lecture: build lecture:
stage: build stage: build
before_script: before_script:
- mkdir -p dep_modules - |
- pushd dep_modules if [ ! "${DUMUX_BRANCH}" ]; then
- > DUMUX_BRANCH=master;
if [ ! -d dune-foamgrid ]; then else
git clone -b releases/2.7 --depth 1 https://gitlab.dune-project.org/extensions/dune-foamgrid.git; echo "Received branch name ${DUMUX_BRANCH} from upstream"
dunecontrol --opts=/duneci/dune.opts --only=dune-foamgrid all;
fi
- >
if [ ! -d dune-alugrid ]; then
git clone -b releases/2.7 --depth 1 https://gitlab.dune-project.org/extensions/dune-alugrid.git;
dunecontrol --opts=/duneci/dune.opts --make-options="-j8" --only=dune-alugrid all;
fi fi
- > - echo "Checking out branch ${DUMUX_BRANCH} in dumux"
if [ ! -d dumux ]; then - git clone -b ${DUMUX_BRANCH} --depth 1 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git
git clone -b master --depth 1 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git; - dunecontrol --opts=$DUNE_OPTS_FILE --only=dumux all
dunecontrol --opts=/duneci/dune.opts --only=dumux all
fi
- popd
script: script:
- cd .. - dunecontrol --opts=$DUNE_OPTS_FILE --current all
- dunecontrol --opts=/duneci/dune.opts --only=dumux-lecture all - dunecontrol --opts=$DUNE_OPTS_FILE --current bexec make -k -j4 build_tests
- cd dumux-lecture/build-cmake
- make -k -j 8 build_tests
artifacts: artifacts:
paths: paths:
- build-cmake - build-cmake
- dumux
expire_in: 3 hours expire_in: 3 hours
test lecture: test lecture:
stage: test stage: test
script: script:
- cd build-cmake - dunecontrol --opts=$DUNE_OPTS_FILE --current bexec dune-ctest -j4 --output-on-failure
- duneci-ctest -j4 --no-tests=error
needs: needs:
- job: build lecture - job: build lecture
artifacts: true artifacts: true
artifacts:
reports:
junit: junit/dumux-lecture-cmake.xml
Supports Markdown
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