From 82a38bdafb4f8ac8c9877edc05464153b395c5dc Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 4 Oct 2021 10:33:55 +0200
Subject: [PATCH] [ci] Set container cpu-target as a global variable.
---
.gitlab-ci.yml | 1 +
scripts/ci/jobs/container.yml | 9 ++++++---
scripts/ci/jobs/jupyter.yml | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b4205d29f0..634f6cd3409 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ variables:
BUILD_PROCESSES: "" # Empty string: builds all processes
BUILD_TESTS: "true"
BUILD_CTEST: "true"
+ CPU_TARGET: sandybridge
workflow:
rules:
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index 37fa423bc59..9dad0fb35ec 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -25,14 +25,16 @@ container:
poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain'
--cvode --ccache --mfront
- --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_TESTING=OFF'
+ --cpu-target $CPU_TARGET
+ --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
$DOCKER_TAG_SERIAL
# petsc container
- >
poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain'
--cvode --ccache
- --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_TESTING=OFF'
+ --cpu-target $CPU_TARGET
+ --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
--base_image 'centos:8' --ompi 4.0.5 --mpi_benchmarks
# test ogs can run in container
- |
@@ -44,7 +46,8 @@ container:
poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain'
--cvode --ccache
- --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_CLI=OFF -DOGS_BUILD_UTILS=OFF -DOGS_BUILD_TESTING=OFF'
+ --cpu-target $CPU_TARGET
+ --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_CLI=OFF -DOGS_BUILD_UTILS=OFF -DOGS_BUILD_TESTING=OFF'
--gui
artifacts:
name: container
diff --git a/scripts/ci/jobs/jupyter.yml b/scripts/ci/jobs/jupyter.yml
index 9b69ebac98f..8cfcba7e5f1 100644
--- a/scripts/ci/jobs/jupyter.yml
+++ b/scripts/ci/jobs/jupyter.yml
@@ -19,7 +19,7 @@ build jupyter:
poetry run ogscm compiler.py ogs.py ogs_jupyter.py -B -R --ogs ../..
--build_args ' --progress=plain'
--cvode --ccache --mfront
- --cpu-target sandybridge
+ --cpu-target $CPU_TARGET
--cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
--runtime_base_image 'jupyter/base-notebook'
--tag $DOCKER_TAG_JUPYTER
--
GitLab