From 15011b76c79a47acbd933f457944cb21c634ab06 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 30 Aug 2019 11:40:09 +0200
Subject: [PATCH] [ci] Build ogs docker images in GitLab CI.
---
.dockerignore | 2 +-
.gitignore | 2 +-
.gitlab-ci.yml | 29 ++++++++++++++---------------
ThirdParty/container-maker | 2 +-
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 59070d1dcb6..472cdd2e7ac 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,2 @@
-.git
+# .git
Tests/Data
diff --git a/.gitignore b/.gitignore
index 14fb1e695e3..56bd57de1b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
*.bak*
-build*/
+/build*/
*.sw[op]
tags
.ExternalData_*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0b49f06d84..62ca9abfafb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,18 @@
-image: alpine:3.4
+variables:
+ GIT_STRATEGY: fetch
+ OPENMPI_VERSIONS: 'off 2.1.6 3.1.4 4.0.1'
-before_script:
- - apk update && apk add openssl
- - wget https://github.com/spf13/hugo/releases/download/v0.18.1/hugo_0.18.1_Linux-64bit.tar.gz
- - tar xf hugo_0.18.1_Linux-64bit.tar.gz && cp ./hugo_0.18.1_linux_amd64/hugo_0.18.1_linux_amd64 /usr/bin/hugo
- - hugo version
-
-pages:
+build-container:
+ tags:
+ - docker-shell
+ stage: build
script:
- - cd web
- - (cd import; python import.py)
- - gulp build
- - hugo
+ - 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:
- - web/public
- only:
- - web-hugo
+ - _out/images/*.sif
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index b673ba0a252..8701618b2dc 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit b673ba0a252264ea37e7ca60784bdfe558e57e3b
+Subproject commit 8701618b2dc6745a603c2bf147c61d75e1268e42
--
GitLab