From ac31f70ab1dfc8c3e644655b433d68744a0e8693 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 31 Jan 2020 11:19:31 +0100
Subject: [PATCH] [ci] Test includes.
---
.gitlab-ci.yml | 23 ++++++-----------------
scripts/ci/jobs/build.yml | 25 +++++++++++++++++++++++++
scripts/ci/jobs/container.yml | 20 ++++++++++++++++++++
3 files changed, 51 insertions(+), 17 deletions(-)
create mode 100644 scripts/ci/jobs/build.yml
create mode 100644 scripts/ci/jobs/container.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62ca9abfafb..bf7c56f8e37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,7 @@
-variables:
- GIT_STRATEGY: fetch
- OPENMPI_VERSIONS: 'off 2.1.6 3.1.4 4.0.1'
+stages:
+ - test
+ - package
-build-container:
- tags:
- - docker-shell
- stage: build
- script:
- - git submodule update --init ThirdParty/container-maker
- - virtualenv .venv
- - source .venv/bin/activate
- - pip install -r ThirdParty/container-maker/requirements.txt
- - export PYTHONPATH="${PYTHONPATH}:${PWD}/ThirdParty/container-maker"
- - python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs . --pm system --cvode --ompi $OPENMPI_VERSIONS
- artifacts:
- paths:
- - _out/images/*.sif
+include:
+ - local: '/scripts/ci/jobs/container.yml'
+ - local: '/scripts/ci/jobs/build.yml'
diff --git a/scripts/ci/jobs/build.yml b/scripts/ci/jobs/build.yml
new file mode 100644
index 00000000000..1d47a782024
--- /dev/null
+++ b/scripts/ci/jobs/build.yml
@@ -0,0 +1,25 @@
+build:
+ stage: test
+ variables:
+ CONAN_USER_HOME: "$CI_PROJECT_DIR"
+ CCACHE_DIR: "$CI_PROJECT_DIR/.ccache"
+ CTEST_NUM_THREADS: '4'
+ CTEST_LARGE_NUM_THREADS: '3'
+ image:
+ name: ogs6/gcc
+ entrypoint:
+ - '/usr/bin/env'
+ - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+ cache:
+ paths:
+ - .conan
+ - .ccache
+
+ before_script:
+ - mkdir -p build
+ - cd build
+
+ script:
+ - cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DOGS_BUILD_PROCESSES=GroundwaterFlow
+ - cmake --build . --target tests
+ - cmake --build . --target ctest -j 3
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
new file mode 100644
index 00000000000..0b9fb648b36
--- /dev/null
+++ b/scripts/ci/jobs/container.yml
@@ -0,0 +1,20 @@
+container:
+ only:
+ refs:
+ - master
+ tags:
+ - docker-shell
+ stage: package
+ variables:
+ GIT_STRATEGY: fetch
+ OPENMPI_VERSIONS: 'off 2.1.6 3.1.4 4.0.1'
+ script:
+ - git submodule update --init ThirdParty/container-maker
+ - virtualenv .venv
+ - source .venv/bin/activate
+ - pip install -r ThirdParty/container-maker/requirements.txt
+ - export PYTHONPATH="${PYTHONPATH}:${PWD}/ThirdParty/container-maker"
+ - python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs . --pm system --cvode --ompi $OPENMPI_VERSIONS
+ artifacts:
+ paths:
+ - _out/images/*.sif
--
GitLab