Merge branch 'master' into cache

espressomd · Sep 26, 2019 · c643377 · c643377
2 parents d1b6fb6 + 5c6dd8e
commit c643377
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ stages:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
   script:
     - sh maintainer/docker_build.sh
-  timeout: 1h
+  timeout: 2h
   interruptible: true
   tags:
     - docker
@@ -27,6 +27,12 @@ stages:
 .deploy_template:
   extends: .build_template
   stage: deploy
+  timeout: 15m
+  script:
+  - echo "FROM $CI_REGISTRY/$CI_PROJECT_PATH/test/$CI_JOB_NAME-$CI_COMMIT_SHA" | /kaniko/executor --dockerfile /dev/stdin --destination $CI_REGISTRY/$CI_PROJECT_PATH/$CI_JOB_NAME
+  tags:
+    - docker
+    - linux
   only:
     - master
     - /[0-9]\..*/
@@ -79,7 +85,6 @@ ubuntu-python3:cuda-9.0:build:
   extends: .build_template
 ubuntu-python3:cuda-10.1:build:
   extends: .build_template
-  timeout: 2h
 ubuntu:arm64:build:
   extends:
     - .build_template

diff --git a/docker/intel-python3/Dockerfile-18 b/docker/intel-python3/Dockerfile-18
@@ -48,7 +48,7 @@ RUN cd /tmp \
  && cd boost_1_66_0 \
  && echo 'using mpi : mpiicpc ;' > tools/build/src/user-config.jam \
  && ./bootstrap.sh \
- && ./b2 -j $(nproc) -d0 toolset=intel install --prefix=/opt/boost \
+ && ./b2 -j $(nproc) -d0 warnings=off toolset=intel install --prefix=/opt/boost \
  && cd \
  && rm -r /tmp/boost
 

diff --git a/docker/ubuntu-python3/Dockerfile-min_boost b/docker/ubuntu-python3/Dockerfile-min_boost
@@ -33,7 +33,7 @@ RUN cd /tmp \
     && cd boost_1_55_0 \
     && ./bootstrap.sh \
     && echo "using mpi ;" >> project-config.jam \
-    && ./b2 -j $(nproc) install --prefix=/opt/boost \
+    && ./b2 -j $(nproc) -d0 warnings=off install --prefix=/opt/boost \
     && cd \
     && rm -r /tmp/boost