From 1c6eea5fdd2666ea24473adc278da52de42c8736 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 7 Oct 2020 13:43:49 +0200
Subject: [PATCH] [ci] Fix master.
---
ThirdParty/container-maker | 2 +-
scripts/ci/extends/container-maker-setup.yml | 6 ++----
scripts/ci/jobs/build_image.yml | 6 +++---
scripts/ci/jobs/check-header.yml | 2 +-
scripts/ci/jobs/container.yml | 8 ++++----
5 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index dd01b38f400..ada9862a5db 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit dd01b38f400a7e3dbfa85a3d7eeeddaa9bdd8c8f
+Subproject commit ada9862a5db500ed31b2c80c3d660ccdb6c016c3
diff --git a/scripts/ci/extends/container-maker-setup.yml b/scripts/ci/extends/container-maker-setup.yml
index fc19d828d93..463ad8bbc4f 100644
--- a/scripts/ci/extends/container-maker-setup.yml
+++ b/scripts/ci/extends/container-maker-setup.yml
@@ -1,7 +1,5 @@
.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"
+ - cd ThirdParty/container-maker
+ - poetry install
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index 2e6255df5aa..e3b9feca1ec 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -9,13 +9,13 @@ build container images:
extends: .container-maker-setup
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
+ - poetry run ogscm --build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --tfel --ccache
--tag $CONTAINER_GCC_IMAGE --upload
- - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
+ - poetry run ogscm --build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --gui --ccache
--tag $CONTAINER_GCC_GUI_IMAGE --upload
- - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
+ - poetry run ogscm --build --ogs off
--compiler clang --compiler_version 9 --ccache
--tag $CONTAINER_CLANG_IMAGE --upload
diff --git a/scripts/ci/jobs/check-header.yml b/scripts/ci/jobs/check-header.yml
index fb3fa9dcb72..6bf461d5c83 100644
--- a/scripts/ci/jobs/check-header.yml
+++ b/scripts/ci/jobs/check-header.yml
@@ -3,7 +3,7 @@ check header:
allow_failure: true
extends:
- .rules-master-manual
- dependencies: [meta_container]
+ dependencies: [meta, meta_container]
variables:
BUILD_DIR: "build-check-header"
CMAKE_ARGS: "-DOGS_CHECK_HEADER_COMPILATION=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_GUI=ON -DOGS_USE_PYTHON=ON -DBUILD_SHARED_LIBS=ON"
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index 404946d1bac..402e436e8c7 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -9,18 +9,18 @@ container:
- .container-maker-setup
script:
- >
- python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs .
+ poetry run ogscm -B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
--cmake_args ' -DBUILD_TESTING=OFF'
- >
- python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs .
+ poetry run ogscm -B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
--cmake_args ' -DBUILD_TESTING=OFF'
--ompi 4.0.4 --insitu --mpi_benchmarks
- >
- python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs .
+ poetry run ogscm -B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
--cmake_args ' -DBUILD_TESTING=OFF'
@@ -28,4 +28,4 @@ container:
artifacts:
name: container
paths:
- - _out/images/*.sif
+ - ThirdParty/container-maker/_out/images/*.sif
--
GitLab