Skip to content
Snippets Groups Projects
Verified Commit 82a38bda authored by Lars Bilke's avatar Lars Bilke
Browse files

[ci] Set container cpu-target as a global variable.

parent e377aa06
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,7 @@ variables: ...@@ -11,6 +11,7 @@ variables:
BUILD_PROCESSES: "" # Empty string: builds all processes BUILD_PROCESSES: "" # Empty string: builds all processes
BUILD_TESTS: "true" BUILD_TESTS: "true"
BUILD_CTEST: "true" BUILD_CTEST: "true"
CPU_TARGET: sandybridge
workflow: workflow:
rules: rules:
......
...@@ -25,14 +25,16 @@ container: ...@@ -25,14 +25,16 @@ container:
poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../.. poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain' --build_args ' --progress=plain'
--cvode --ccache --mfront --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 $DOCKER_TAG_SERIAL
# petsc container # petsc container
- > - >
poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../.. poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain' --build_args ' --progress=plain'
--cvode --ccache --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 --base_image 'centos:8' --ompi 4.0.5 --mpi_benchmarks
# test ogs can run in container # test ogs can run in container
- | - |
...@@ -44,7 +46,8 @@ container: ...@@ -44,7 +46,8 @@ container:
poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../.. poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain' --build_args ' --progress=plain'
--cvode --ccache --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 --gui
artifacts: artifacts:
name: container name: container
......
...@@ -19,7 +19,7 @@ build jupyter: ...@@ -19,7 +19,7 @@ build jupyter:
poetry run ogscm compiler.py ogs.py ogs_jupyter.py -B -R --ogs ../.. poetry run ogscm compiler.py ogs.py ogs_jupyter.py -B -R --ogs ../..
--build_args ' --progress=plain' --build_args ' --progress=plain'
--cvode --ccache --mfront --cvode --ccache --mfront
--cpu-target sandybridge --cpu-target $CPU_TARGET
--cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF' --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
--runtime_base_image 'jupyter/base-notebook' --runtime_base_image 'jupyter/base-notebook'
--tag $DOCKER_TAG_JUPYTER --tag $DOCKER_TAG_JUPYTER
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment