Update CI on 2020 branch

[alexxy/gromacs.git] / admin / gitlab-ci / archive.gitlab-ci.yml

diff --git a/admin/gitlab-ci/archive.gitlab-ci.yml b/admin/gitlab-ci/archive.gitlab-ci.yml
index 0d4901cfbef1f69940f40183a022f9ef5ef2354d..5ff56fa279fd9200b3263f6642e6164d0a2eb928 100644 (file)
--- a/admin/gitlab-ci/archive.gitlab-ci.yml
+++ b/admin/gitlab-ci/archive.gitlab-ci.yml
@@ -7,16 +7,14 @@ 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:2020
   stage: configure-build
-
   variables:
     KUBERNETES_CPU_LIMIT: 1
     KUBERNETES_CPU_REQUEST: 1
-    KUBERNETES_MEMORY_LIMIT: 2Gi
+    KUBERNETES_MEMORY_REQUEST: 2Gi
   script:
     - cmake -P cmake/gmxVersionInfo.cmake &> version.json
-
   artifacts:
     paths:
       - version.json
@@ -27,18 +25,26 @@ prepare-release-version:
 regressiontests:prepare:
   extends:
     - .variables:default
-    - .rules:merge-requests
+    - .rules:merge-and-post-merge-acceptance
   cache: {}
-  image: biophysics/gcc-gromacs
+  image: gromacs/ci-docs-llvm:2020
   stage: configure-build
-
   variables:
     KUBERNETES_CPU_LIMIT: 1
     KUBERNETES_CPU_REQUEST: 1
-    KUBERNETES_MEMORY_LIMIT: 2Gi
+    KUBERNETES_MEMORY_REQUEST: 2Gi
   # Always clone the default version for this branch, master in this case
   script:
     - export REGTESTBRANCH=release-2020
+    - if [[ ! -z $REGRESSIONTESTBRANCH ]] ; then
+      export REGTESTBRANCH=$REGRESSIONTESTBRANCH ;
+      echo "Using $REGTESTBRANCH instead of default" ;
+      fi
+    - export CHECKOUTCOMMIT=FETCH_HEAD
+    - if [[ ! -z $REGRESSIONTESTCOMMIT ]] ; then
+      export CHECKOUTCOMMIT=$REGRESSIONTESTCOMMIT ;
+      echo "Using $CHECKOUTCOMMIT instead of head of $REGTESTBRANCH" ;
+      fi
     - if [[ ! -d regressiontests ]] ; then
         mkdir regressiontests ;
         cd regressiontests ;
@@ -47,7 +53,7 @@ regressiontests:prepare:
       fi
     - cd regressiontests
     - git fetch https://gitlab.com/gromacs/gromacs-regressiontests.git $REGTESTBRANCH
-    - git checkout -qf FETCH_HEAD
+    - git checkout -qf $CHECKOUTCOMMIT
     - git clean -ffdxq
     - git gc
     - git archive -o gmx-regressiontests.tar.gz --prefix regressiontests/ -9 HEAD
@@ -65,13 +71,12 @@ 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:2020
   stage: release-package
-
   variables:
     KUBERNETES_CPU_LIMIT: 1
     KUBERNETES_CPU_REQUEST: 1
-    KUBERNETES_MEMORY_LIMIT: 2Gi
+    KUBERNETES_MEMORY_REQUEST: 2Gi
   needs:
     - job: prepare-release-version
   script:
@@ -144,7 +149,7 @@ archive:configure:release:
   variables:
     KUBERNETES_CPU_LIMIT: 4
     KUBERNETES_CPU_REQUEST: 2
-    KUBERNETES_MEMORY_LIMIT: 4Gi
+    KUBERNETES_MEMORY_REQUEST: 4Gi
   script:
     - rm -rf gromacs*tar.gz
     - cd $BUILD_DIR
@@ -203,7 +208,7 @@ archive:package:
     BUILD_DIR: build-package
 
 release-verify:
-  image: biophysics/gcc-gromacs
+  image: gromacs/ci-docs-llvm:2020
   stage: release-verify
   extends:
     - .variables:default
@@ -213,7 +218,7 @@ release-verify:
   variables:
     KUBERNETES_CPU_LIMIT: 1
     KUBERNETES_CPU_REQUEST: 1
-    KUBERNETES_MEMORY_LIMIT: 2Gi
+    KUBERNETES_MEMORY_REQUEST: 2Gi
   script:
     - VERSION=`cat version.json |
       python3 -c "import json,sys; print(json.load(sys.stdin)['version'])"`