From 787cce97fb033ebf81e92d8aedd04dfa06a9ee85 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 10 Jun 2020 12:56:32 +0200
Subject: [PATCH] Always inlcude ogs_base().
---
.gitlab-ci.yml | 2 ++
ogscm/cli.py | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01d7a65..a6cd285 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,8 @@ dev images:
- python ogscm/cli.py -B -C --sif_file ubuntu-dev.sif --pm system --ogs off
- python ogscm/cli.py -B -C --sif_file centos-dev.sif --base_image centos:8 --pm system --ogs off
artifacts:
+ # example URL:
+ # https://gitlab.opengeosys.org/ogs/container-maker/-/jobs/artifacts/master/raw/_out/images/ubuntu-dev.sif?job=dev+images
paths:
- _out/images/*.sif
diff --git a/ogscm/cli.py b/ogscm/cli.py
index 4cdaf3b..d7082dc 100644
--- a/ogscm/cli.py
+++ b/ogscm/cli.py
@@ -252,8 +252,7 @@ def main(): # pragma: no cover
src='/usr/local/bin/mpi_*',
dest='/usr/local/bin/')
- if ogs_version != 'off' or args.jenkins or args.gitlab:
- Stage0 += ogs_base()
+ Stage0 += ogs_base()
if args.gui:
Stage0 += packages(ospackages=[
'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev',
--
GitLab