Merge branch release-2021

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

diff --git a/admin/gitlab-ci/python-gmxapi02.gitlab-ci.yml b/admin/gitlab-ci/python-gmxapi02.gitlab-ci.yml
index 8f0588cdb6ac220337345e214ed16c22dd8fbc2b..fc267ecfa7e993db009f40ed381bf6662686e633 100644 (file)
--- a/admin/gitlab-ci/python-gmxapi02.gitlab-ci.yml
+++ b/admin/gitlab-ci/python-gmxapi02.gitlab-ci.yml
@@ -2,11 +2,11 @@
 # Jobs to test gmxapi client (Python) packages
 #
 
-.gmxapi-0.2:gcc-7:gmx2021:
+.gmxapi-0.2:gcc-10:gmx2021:
   extends:
     - .variables:default
     - .use-clang:base
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10
   stage: test
   variables:
     KUBERNETES_CPU_LIMIT: 2
@@ -33,28 +33,28 @@
     - k8s-scilifelab
   # The dependency means we need to use the same tag restriction as upstream.
   needs:
-    - job: gromacs:gcc-7:build
+    - job: gromacs:gcc-10:build
       artifacts: true
 
-gmxapi-0.2:gcc-7:gmx2021:py-3.6.10:
+gmxapi-0.2:gcc-10:gmx2021:py-3.6.10:
   extends:
-    - .gmxapi-0.2:gcc-7:gmx2021
+    - .gmxapi-0.2:gcc-10:gmx2021
     - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.6"
     PY_VER: "3.6.10"
 
-gmxapi-0.2:gcc-7:gmx2021:py-3.7.7:
+gmxapi-0.2:gcc-10:gmx2021:py-3.7.7:
   extends:
-    - .gmxapi-0.2:gcc-7:gmx2021
+    - .gmxapi-0.2:gcc-10:gmx2021
     - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.7"
     PY_VER: "3.7.7"
 
-gmxapi-0.2:gcc-7:gmx2021:py-3.8.2:
+gmxapi-0.2:gcc-10:gmx2021:py-3.8.2:
   extends:
-    - .gmxapi-0.2:gcc-7:gmx2021
+    - .gmxapi-0.2:gcc-10:gmx2021
     - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.8"