From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Mon, 17 Aug 2020 04:39:09 +0000 (+0200)
Subject: Stopped using images in biophysics Docker repository
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=522fd3d94f82997ef42e4b19d2987de97fb0c482;p=alexxy%2Fgromacs.git

Stopped using images in biophysics Docker repository

Also avoided compiling SIMD kernels for the build that
merely produces content for the tarballs.

Fixes #3619
---

diff --git a/admin/gitlab-ci/archive.gitlab-ci.yml b/admin/gitlab-ci/archive.gitlab-ci.yml
index ff9b522a65..5595f06301 100644
--- a/admin/gitlab-ci/archive.gitlab-ci.yml
+++ b/admin/gitlab-ci/archive.gitlab-ci.yml
@@ -7,7 +7,7 @@ prepare-release-version:
   cache: {}
   # Docker image uploaded to dockerhub by user eriklindahl
   # TODO: Get DockerFile for admin/dockerfiles
-  image: biophysics/gcc-gromacs
+  image: gromacs/ci-docs-llvm-master
   stage: configure-build
   variables:
     KUBERNETES_CPU_LIMIT: 1
@@ -27,7 +27,7 @@ regressiontests:prepare:
     - .variables:default
     - .rules:merge-requests
   cache: {}
-  image: biophysics/gcc-gromacs
+  image: gromacs/ci-docs-llvm-master
   stage: configure-build
   variables:
     KUBERNETES_CPU_LIMIT: 1
@@ -71,7 +71,7 @@ regressiontests:package:
   cache: {}
   # Docker image uploaded to dockerhub by user eriklindahl
   # TODO: Get DockerFile for admin/dockerfiles
-  image: biophysics/gcc-gromacs
+  image: gromacs/ci-docs-llvm-master
   stage: release-package
   variables:
     KUBERNETES_CPU_LIMIT: 1
@@ -120,7 +120,7 @@ archive:configure:nightly:
   variables:
     BUILD_DIR: build-package
     CMAKE_SIMD_OPTIONS: -DGMX_SIMD=None
-    CMAKE_EXTRA_OPTIONS: -DGMX_BUILD_HELP=on -DGMX_USE_RDTSCP=OFF
+    CMAKE_EXTRA_OPTIONS: -DGMX_BUILD_HELP=on -DGMX_USE_RDTSCP=OFF -DGMX_USE_SIMD_KERNELS=off
     CMAKE_MPI_OPTIONS: -DGMX_THREAD_MPI=OFF -DGMX_OPENMP=OFF
 
 archive:configure:release:
@@ -130,7 +130,7 @@ archive:configure:release:
   variables:
     BUILD_DIR: build-package
     CMAKE_SIMD_OPTIONS: -DGMX_SIMD=None
-    CMAKE_EXTRA_OPTIONS: -DGMX_BUILD_HELP=on -DGMX_USE_RDTSCP=OFF
+    CMAKE_EXTRA_OPTIONS: -DGMX_BUILD_HELP=on -DGMX_USE_RDTSCP=OFF -DGMX_USE_SIMD_KERNELS=off
     CMAKE_MPI_OPTIONS: -DGMX_THREAD_MPI=OFF -DGMX_OPENMP=OFF
 
 # Right now we need to use an ugly hack to move the original build directory
@@ -208,7 +208,7 @@ archive:package:
     BUILD_DIR: build-package
 
 release-verify:
-  image: biophysics/gcc-gromacs
+  image: gromacs/ci-docs-llvm-master
   stage: release-verify
   extends:
     - .variables:default