Skip to content

Commit

Permalink
[ci] Added build_image job.
Browse files Browse the repository at this point in the history
  • Loading branch information
bilke committed Jun 5, 2020
1 parent ac31f70 commit 3c7ca22
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ stages:
- package

include:
- local: '/scripts/ci/jobs/container.yml'
- local: '/scripts/ci/extends/container-maker-setup.yml'
- local: '/scripts/ci/jobs/build_image.yml'
- local: '/scripts/ci/jobs/build.yml'
- local: '/scripts/ci/jobs/container.yml'
7 changes: 7 additions & 0 deletions scripts/ci/extends/container-maker-setup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.container-maker-setup:
before_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"
13 changes: 13 additions & 0 deletions scripts/ci/jobs/build_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
build_image:
stage: .pre
# only:
# changes:
# - ThirdParty/container-maker
tags:
- docker-shell
variables:
GIT_STRATEGY: fetch
extends: .container-maker-setup
script:
# --jenkins? --gui?
- python ThirdParty/container-maker/ogscm/cli.py -B --ogs off --pm system --cvode --cppcheck --docs --gcovr
8 changes: 2 additions & 6 deletions scripts/ci/jobs/container.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
container:
stage: package
only:
refs:
- master
tags:
- docker-shell
stage: package
variables:
GIT_STRATEGY: fetch
OPENMPI_VERSIONS: 'off 2.1.6 3.1.4 4.0.1'
extends: .container-maker-setup
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:
Expand Down

0 comments on commit 3c7ca22

Please sign in to comment.