Commit 1b555691 authored by Lukas Riedel's avatar Lukas Riedel

ci: Add multicore CPU count variable and set to 3

parent faba1beb
variables:
DUNE_CONTROL_PATH: /opt/dune:$CI_PROJECT_DIR
DUNECONTROL: ./dune-common/bin/dunecontrol
CMAKE_FLAGS:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
MAKE_FLAGS:
-j 4
DIND_PROCNUM: 3
CPUS_MULTICORE: 3
CPUS_DIND: 3
DOCKER_LOGIN:
docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PW
DUNE_ENV_IMAGE:
dorie/dune-env:2.5.1
CMAKE_FLAGS:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
MAKE_FLAGS:
-j $CPUS_MULTICORE
image: $DUNE_ENV_IMAGE
......@@ -38,7 +39,7 @@ setup:dune-env:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$DIND_PROCNUM -f dockerfiles/dune-env -t $DUNE_ENV_IMAGE .
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dune-env -t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
prep:update-dune:
......@@ -56,7 +57,7 @@ prep:update-dune:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$DIND_PROCNUM -f dockerfiles/dune-env-update -t $DUNE_ENV_IMAGE .
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dune-env-update -t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
build:main:
......@@ -171,7 +172,7 @@ deploy:dockerhub-devel:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$DIND_PROCNUM -f dockerfiles/dorie -t dorie/dorie:devel .
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dorie -t dorie/dorie:devel .
- docker push dorie/dorie:devel
deploy:dockerhub-stable:
......@@ -188,5 +189,5 @@ deploy:dockerhub-stable:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$DIND_PROCNUM -f dockerfiles/dorie -t dorie/dorie:$CI_COMMIT_TAG .
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dorie -t dorie/dorie:$CI_COMMIT_TAG .
- docker push dorie/dorie:$CI_COMMIT_TAG
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment