Use updated images for Python CI jobs.

Also switches tool chains to account for rearrangement in the
CI testing matrix.

Fixes #3714

diff --git a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
index a9801ec3898ef75c67693a751a99f0837f36854a..5715a736a136f11022ee2e128c2f7e720ded8e28 100644 (file)
--- a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
+++ b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
@@ -74,12 +74,11 @@ gmxapi-0.1:clang-8:py-3.8.2:
     VENVPATH: "/root/venv/py3.8"
     PY_VER: "3.8.2"
 
-# Base job definition for gmxapi 0.2 tests against GROMACS 2021 in clang-8 environments.
-.gmxapi-0.2:clang-8:gmx2021:
+.gmxapi-0.2:gcc-7:gmx2021:
   extends:
     - .variables:default
     - .use-clang:base
-  image: gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020
+  image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master
   stage: test
   variables:
     KUBERNETES_CPU_LIMIT: 2
@@ -106,28 +105,28 @@ gmxapi-0.1:clang-8:py-3.8.2:
     - k8s-scilifelab
   # The dependency means we need to use the same tag restriction as upstream.
   needs:
-    - job: gromacs:clang-8:build
+    - job: gromacs:gcc-7:build
       artifacts: true
 
-gmxapi-0.2:clang-8:gmx2021:py-3.6.10:
+gmxapi-0.2:gcc-7:gmx2021:py-3.6.10:
   extends:
-    - .gmxapi-0.2:clang-8:gmx2021
+    - .gmxapi-0.2:gcc-7:gmx2021
     - .rules:merge-requests:master
   variables:
     VENVPATH: "/root/venv/py3.6"
     PY_VER: "3.6.10"
 
-gmxapi-0.2:clang-8:gmx2021:py-3.7.7:
+gmxapi-0.2:gcc-7:gmx2021:py-3.7.7:
   extends:
-    - .gmxapi-0.2:clang-8:gmx2021
+    - .gmxapi-0.2:gcc-7:gmx2021
     - .rules:merge-requests:master
   variables:
     VENVPATH: "/root/venv/py3.7"
     PY_VER: "3.7.7"
 
-gmxapi-0.2:clang-8:gmx2021:py-3.8.2:
+gmxapi-0.2:gcc-7:gmx2021:py-3.8.2:
   extends:
-    - .gmxapi-0.2:clang-8:gmx2021
+    - .gmxapi-0.2:gcc-7:gmx2021
     - .rules:merge-requests:master
   variables:
     VENVPATH: "/root/venv/py3.8"

diff --git a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
index 3488feed78eebe1ac8c2515b2cd27506ca030bc8..25d2fc6734400123abe52aac913dfcbc5a7a8af6 100644 (file)
--- a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
+++ b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
@@ -1,9 +1,9 @@
 # Base job definition for sample_restraint tests against GROMACS 2021.
-.sample_restraint:clang-8:gmx2021:
+.sample_restraint:gcc-7:gmx2021:
   extends:
     - .variables:default
     - .use-clang:base
-  image: gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020
+  image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master
   stage: test
   variables:
     KUBERNETES_CPU_LIMIT: 2
@@ -27,28 +27,28 @@
     - k8s-scilifelab
   # The dependency means we need to use the same tag restriction as upstream.
   needs:
-    - job: gromacs:clang-8:build
+    - job: gromacs:gcc-7:build
       artifacts: true
 
-sample_restraint:clang-8:gmx2021:py-3.6.10:
+sample_restraint:gcc-7:gmx2021:py-3.6.10:
   extends:
-    - .sample_restraint:clang-8:gmx2021
+    - .sample_restraint:gcc-7:gmx2021
     - .rules:merge-requests:master
   variables:
     VENVPATH: "/root/venv/py3.6"
     PY_VER: "3.6.10"
 
-sample_restraint:clang-8:gmx2021:py-3.7.7:
+sample_restraint:gcc-7:gmx2021:py-3.7.7:
   extends:
-    - .sample_restraint:clang-8:gmx2021
+    - .sample_restraint:gcc-7:gmx2021
     - .rules:merge-requests:master
   variables:
     VENVPATH: "/root/venv/py3.7"
     PY_VER: "3.7.7"
 
-sample_restraint:clang-8:gmx2021:py-3.8.2:
+sample_restraint:gcc-7:gmx2021:py-3.8.2:
   extends:
-    - .sample_restraint:clang-8:gmx2021
+    - .sample_restraint:gcc-7:gmx2021
     - .rules:merge-requests:master
   variables:
     VENVPATH: "/root/venv/py3.8"