biod.pnpi.spb.ru / alexxy / gromacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch release-2021
[alexxy/gromacs.git] / admin / gitlab-ci / gromacs.gitlab-ci.yml
diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml
index 939b51142de68461cbb6563f1d59f6281b1f45dc..b55d9fd323e63939c4701e9311d547dcca35d54f 100644 (file)
--- a/admin/gitlab-ci/gromacs.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml
@@ -220,18 +220,18 @@ simple-build:
 
 # Templates for configuration stage
 
-gromacs:gcc-7:configure:
+gromacs:gcc-10:configure:
   extends:
     - .gromacs:base:configure
     - .use-gcc:base
     - .use-opencl
     - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10
   variables:
     CMAKE: /usr/local/cmake-3.13.0/bin/cmake
     CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=AVX2_256"
     CMAKE_EXTRA_OPTIONS: "-DGMX_EXTERNAL_CLFFT=ON -DGMX_INSTALL_LEGACY_API=ON"
-    COMPILER_MAJOR_VERSION: 7
+    COMPILER_MAJOR_VERSION: 10
 
 gromacs:clang-8-cuda-10.0:configure:
   extends:
@@ -247,17 +247,17 @@ gromacs:clang-8-cuda-10.0:configure:
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
     COMPILER_MAJOR_VERSION: 8
 
-gromacs:gcc-8-cuda-11.0:configure:
+gromacs:gcc-7-cuda-10.2:configure:
   extends:
     - .gromacs:base:configure
     - .use-gcc:base
     - .use-cuda
     - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2
   variables:
     CMAKE: /usr/local/cmake-3.15.7/bin/cmake
     CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=SSE4.1"
-    COMPILER_MAJOR_VERSION: 8
+    COMPILER_MAJOR_VERSION: 7
 
 gromacs:gcc-8-cuda-11.0:configureMPI:
   extends:
@@ -283,6 +283,16 @@ gromacs:clang-TSAN:configure:
     COMPILER_MAJOR_VERSION: 8
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=TSAN"
 
+gromacs:icc-2021.1:configure:
+  extends:
+   - .gromacs:base:configure
+   - .use-icc-oneapi:base
+   - .rules:merge-and-post-merge-acceptance
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
+  variables:
+    CMAKE: /usr/local/cmake-3.17.2/bin/cmake
+    COMPILER_MAJOR_VERSION: 2021
+
 gromacs:clang-8:configure:
   extends:
     - .gromacs:base:configure
@@ -327,24 +337,24 @@ gromacs:clang-ASAN:configure:
     COMPILER_MAJOR_VERSION: 8
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=ASAN"
 
-gromacs:oneapi-2021.1-beta09-opencl:configure:
+gromacs:oneapi-2021.1.1-opencl:configure:
   extends:
    - .gromacs:base:configure
    - .use-oneapi:base
    - .use-opencl
    - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     COMPILER_MAJOR_VERSION: 2021
 
-gromacs:oneapi-2021.1-beta09-sycl:configure:
+gromacs:oneapi-2021.1.1-sycl:configure:
   extends:
    - .gromacs:base:configure
    - .use-oneapi:base
    - .use-sycl
    - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     COMPILER_MAJOR_VERSION: 2021
@@ -380,17 +390,16 @@ gromacs:gcc-8-cuda-11.0:release:configure:
     - regressiontests:package
     - prepare-release-version
 
-gromacs:gcc-7:release:configure:
+gromacs:gcc-9:release:configure:
   extends:
     - .gromacs:base:release:configure
     - .use-gcc:base
     - .use-opencl
     - .rules:nightly-only-for-release
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9
   variables:
     CMAKE: /usr/local/cmake-3.13.0/bin/cmake
-    COMPILER_MAJOR_VERSION: 7
-    CMAKE_EXTRA_OPTIONS: "-DGMX_EXTERNAL_CLFFT=ON"
+    COMPILER_MAJOR_VERSION: 9
     RELEASE_BUILD_DIR: release-builds-gcc
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=RelWithAssert"
   dependencies:
@@ -428,13 +437,13 @@ gromacs:clang-8-cuda-10.1:release:configure:
     RELEASE_BUILD_DIR: release-builds-clang
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=RelWithAssert"
 
-gromacs:oneapi-2021.1-beta09-opencl:release:configure:
+gromacs:oneapi-2021.1.1-opencl:release:configure:
   extends:
    - .gromacs:base:release:configure
    - .use-oneapi:base
    - .use-opencl
    - .rules:nightly-only-for-release
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     COMPILER_MAJOR_VERSION: 2021
@@ -478,18 +487,18 @@ gromacs:oneapi-2021.1-beta09-opencl:release:configure:
     paths:
       - $BUILD_DIR/scan_html
 
-gromacs:gcc-7:build:
+gromacs:gcc-10:build:
   extends:
     - .variables:default
     - .gromacs:base:build
     - .before_script:default
     - .use-ccache
     - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10
   variables:
     CMAKE: /usr/local/cmake-3.13.0/bin/cmake
   needs:
-    - job: gromacs:gcc-7:configure
+    - job: gromacs:gcc-10:configure
 
 gromacs:clang-8-cuda-10.0:build:
   extends:
@@ -504,18 +513,18 @@ gromacs:clang-8-cuda-10.0:build:
   needs:
     - job: gromacs:clang-8-cuda-10.0:configure
 
-gromacs:gcc-8-cuda-11.0:build:
+gromacs:gcc-7-cuda-10.2:build:
   extends:
     - .variables:default
     - .gromacs:base:build
     - .before_script:default
     - .use-ccache
     - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2
   variables:
     CMAKE: /usr/local/cmake-3.15.7/bin/cmake
   needs:
-    - job: gromacs:gcc-8-cuda-11.0:configure
+    - job: gromacs:gcc-7-cuda-10.2:configure
 
 gromacs:gcc-8-cuda-11.0:buildMPI:
   extends:
@@ -543,6 +552,18 @@ gromacs:clang-TSAN:build:
   needs:
     - job: gromacs:clang-TSAN:configure
 
+gromacs:icc-2021.1:build:
+  extends:
+    - .variables:default
+    - .gromacs:base:build
+    - .use-icc-oneapi:base
+    - .rules:post-merge-acceptance
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
+  variables:
+    CMAKE: /usr/local/cmake-3.17.2/bin/cmake
+  needs:
+    - job: gromacs:icc-2021.1:configure
+
 gromacs:clang-ASAN:build:
   extends:
     - .variables:default
@@ -599,31 +620,31 @@ gromacs:clang-8:build:
   needs:
     - job: gromacs:clang-8:configure
 
-gromacs:oneapi-2021.1-beta09-opencl:build:
+gromacs:oneapi-2021.1.1-opencl:build:
   extends:
     - .variables:default
     - .gromacs:base:build
     - .use-ccache
     - .use-oneapi:base
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-opencl:configure
+    - job: gromacs:oneapi-2021.1.1-opencl:configure
 
-gromacs:oneapi-2021.1-beta09-sycl:build:
+gromacs:oneapi-2021.1.1-sycl:build:
   extends:
     - .variables:default
     - .gromacs:base:build
     - .use-ccache
     - .use-oneapi:base
     - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-sycl:configure
+    - job: gromacs:oneapi-2021.1.1-sycl:configure
 
 gromacs:clang-9-mpi:build:
   extends:
@@ -653,7 +674,7 @@ gromacs:gcc-8-cuda-11.0:release:build:
   needs:
     - job: gromacs:gcc-8-cuda-11.0:release:configure
 
-gromacs:gcc-7:release:build:
+gromacs:gcc-9:release:build:
   extends:
     - .variables:default
     - .gromacs:base:build
@@ -664,9 +685,9 @@ gromacs:gcc-7:release:build:
   variables:
     CMAKE: /usr/local/cmake-3.13.0/bin/cmake
     BUILD_DIR: release-builds-gcc
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9
   needs:
-    - job: gromacs:gcc-7:release:configure
+    - job: gromacs:gcc-9:release:configure
 
 gromacs:clang-9:release:build:
   extends:
@@ -697,7 +718,7 @@ gromacs:clang-8-cuda-10.1:release:build:
   needs:
     - job: gromacs:clang-8-cuda-10.1:release:configure
 
-gromacs:oneapi-2021.1-beta09-opencl:release:build:
+gromacs:oneapi-2021.1.1-opencl:release:build:
   extends:
     - .variables:default
     - .gromacs:base:build
@@ -710,9 +731,9 @@ gromacs:oneapi-2021.1-beta09-opencl:release:build:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     BUILD_DIR: release-builds-oneapi
     COMPILER_MAJOR_VERSION: 2021
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-opencl:release:configure
+    - job: gromacs:oneapi-2021.1.1-opencl:release:configure
 
 # Jobs running during test stage
 
@@ -794,11 +815,11 @@ gromacs:oneapi-2021.1-beta09-opencl:release:build:
     when: always
     expire_in: 1 week
 
-gromacs:gcc-7:test:
+gromacs:gcc-10:test:
   extends:
     - .gromacs:base:test
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10
   variables:
     CMAKE: /usr/local/cmake-3.13.0/bin/cmake
     KUBERNETES_EXTENDED_RESOURCE_NAME: "amd.com/gpu"
@@ -807,7 +828,7 @@ gromacs:gcc-7:test:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-7:build
+    - job: gromacs:gcc-10:build
 
 gromacs:clang-8-cuda-10.0:test:
   extends:
@@ -823,11 +844,11 @@ gromacs:clang-8-cuda-10.0:test:
   needs:
     - job: gromacs:clang-8-cuda-10.0:build
 
-gromacs:gcc-8-cuda-11.0:test:
+gromacs:gcc-7-cuda-10.2:test:
   extends:
     - .gromacs:base:test
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2
   variables:
     CMAKE: /usr/local/cmake-3.15.7/bin/cmake
     KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu"
@@ -835,13 +856,13 @@ gromacs:gcc-8-cuda-11.0:test:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-8-cuda-11.0:build
+    - job: gromacs:gcc-7-cuda-10.2:build
 
-gromacs:gcc-8-cuda-11.0:test-gpucommupd:
+gromacs:gcc-8-cuda-10.2:test-gpucommupd:
   extends:
     - .gromacs:base:test
     - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2
   variables:
     CMAKE: /usr/local/cmake-3.15.7/bin/cmake
     KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu"
@@ -852,7 +873,7 @@ gromacs:gcc-8-cuda-11.0:test-gpucommupd:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-8-cuda-11.0:build
+    - job: gromacs:gcc-7-cuda-10.2:build
 
 gromacs:clang-8:test:
   extends:
@@ -872,6 +893,17 @@ gromacs:clang-TSAN:test:
   needs:
     - job: gromacs:clang-TSAN:build
 
+gromacs:icc-2021.1:test:
+  extends:
+    - .gromacs:base:test
+    - .use-icc-oneapi:base
+    - .rules:post-merge-acceptance
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
+  variables:
+    CMAKE: /usr/local/cmake-3.17.2/bin/cmake
+  needs:
+    - job: gromacs:icc-2021.1:build
+
 gromacs:clang-ASAN:test:
   extends:
     - .gromacs:base:test
@@ -899,27 +931,27 @@ gromacs:clang-UBSAN:test:
   needs:
     - job: gromacs:clang-UBSAN:build
 
-gromacs:oneapi-2021.1-beta09-opencl:test:
+gromacs:oneapi-2021.1.1-opencl:test:
   extends:
     - .gromacs:base:test
     - .use-oneapi:base
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-opencl:build
+    - job: gromacs:oneapi-2021.1.1-opencl:build
 
-gromacs:oneapi-2021.1-beta09-sycl:test:
+gromacs:oneapi-2021.1.1-sycl:test:
   extends:
     - .gromacs:base:test
     - .use-oneapi:base
     - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-sycl:build
+    - job: gromacs:oneapi-2021.1.1-sycl:build
 
 gromacs:clang-9-mpi:test:
   extends:
@@ -933,11 +965,11 @@ gromacs:clang-9-mpi:test:
   needs:
     - job: gromacs:clang-9-mpi:build
 
-gromacs:gcc-7:regressiontest:
+gromacs:gcc-10:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10
   variables:
     CMAKE: /usr/local/cmake-3.13.0/bin/cmake
     KUBERNETES_EXTENDED_RESOURCE_NAME: "amd.com/gpu"
@@ -949,7 +981,7 @@ gromacs:gcc-7:regressiontest:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-7:build
+    - job: gromacs:gcc-10:build
     - job: regressiontests:prepare
 
 gromacs:clang-8-cuda-10.0:regressiontest:
@@ -971,11 +1003,11 @@ gromacs:clang-8-cuda-10.0:regressiontest:
     - job: regressiontests:prepare
 
 
-gromacs:gcc-8-cuda-11.0:regressiontest:
+gromacs:gcc-7-cuda-10.2:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2
   variables:
     CMAKE: /usr/local/cmake-3.15.7/bin/cmake
     KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu"
@@ -986,14 +1018,14 @@ gromacs:gcc-8-cuda-11.0:regressiontest:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-8-cuda-11.0:build
+    - job: gromacs:gcc-7-cuda-10.2:build
     - job: regressiontests:prepare
 
-gromacs:gcc-8-cuda-11.0:regressiontest-gpucommupd-tMPI:
+gromacs:gcc-7-cuda-10.2:regressiontest-gpucommupd-tMPI:
   extends:
     - .gromacs:base:regressiontest
     - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2
   variables:
     CMAKE: /usr/local/cmake-3.15.7/bin/cmake
     KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu"
@@ -1007,7 +1039,7 @@ gromacs:gcc-8-cuda-11.0:regressiontest-gpucommupd-tMPI:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-8-cuda-11.0:build
+    - job: gromacs:gcc-7-cuda-10.2:build
     - job: regressiontests:prepare
   artifacts:
     paths:
@@ -1015,11 +1047,11 @@ gromacs:gcc-8-cuda-11.0:regressiontest-gpucommupd-tMPI:
     when: always
     expire_in: 1 week
 
-gromacs:gcc-8-cuda-11.0:regressiontest-upd-tMPI:
+gromacs:gcc-7-cuda-10.2:regressiontest-upd-tMPI:
   extends:
     - .gromacs:base:regressiontest
     - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2
   variables:
     KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu"
     KUBERNETES_EXTENDED_RESOURCE_LIMIT: 2
@@ -1030,7 +1062,7 @@ gromacs:gcc-8-cuda-11.0:regressiontest-upd-tMPI:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-8-cuda-11.0:build
+    - job: gromacs:gcc-7-cuda-10.2:build
     - job: regressiontests:prepare
   artifacts:
     paths:
@@ -1089,6 +1121,18 @@ gromacs:clang-TSAN:regressiontest:
     - job: gromacs:clang-TSAN:build
     - job: regressiontests:prepare
 
+gromacs:icc-2021.1:regressiontest:
+  extends:
+    - .gromacs:base:regressiontest
+    - .use-icc-oneapi:base
+    - .rules:post-merge-acceptance
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
+  variables:
+    CMAKE: /usr/local/cmake-3.17.2/bin/cmake
+  needs:
+    - job: gromacs:icc-2021.1:build
+    - job: regressiontests:prepare
+
 gromacs:clang-ASAN:regressiontest:
   extends:
     - .gromacs:base:regressiontest
@@ -1118,28 +1162,28 @@ gromacs:clang-9:regressiontest:
     - job: gromacs:clang-9-mpi:build
     - job: regressiontests:prepare
 
-gromacs:oneapi-2021.1-beta09-opencl:regressiontest:
+gromacs:oneapi-2021.1.1-opencl:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .use-oneapi:base
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-opencl:build
+    - job: gromacs:oneapi-2021.1.1-opencl:build
     - job: regressiontests:prepare
 
-gromacs:oneapi-2021.1-beta09-sycl:regressiontest:
+gromacs:oneapi-2021.1.1-sycl:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .use-oneapi:base
     - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-sycl:build
+    - job: gromacs:oneapi-2021.1.1-sycl:build
     - job: regressiontests:prepare
 
 gromacs:gcc-8-cuda-11.0:release:test:
@@ -1159,12 +1203,12 @@ gromacs:gcc-8-cuda-11.0:release:test:
     - job: gromacs:gcc-8-cuda-11.0:release:configure
     - job: gromacs:gcc-8-cuda-11.0:release:build
 
-gromacs:gcc-7:release:test:
+gromacs:gcc-9:release:test:
   extends:
     - .gromacs:base:test
     - .rules:nightly-only-for-release
   stage: release-tests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9
   variables:
     CMAKE: /usr/local/cmake-3.13.0/bin/cmake
     BUILD_DIR: release-builds-gcc
@@ -1174,8 +1218,8 @@ gromacs:gcc-7:release:test:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-7:release:configure
-    - job: gromacs:gcc-7:release:build
+    - job: gromacs:gcc-9:release:configure
+    - job: gromacs:gcc-9:release:build
 
 gromacs:clang-9:release:test:
   extends:
@@ -1206,26 +1250,26 @@ gromacs:clang-8-cuda-10.1:release:test:
     - job: gromacs:clang-8-cuda-10.1:release:configure
     - job: gromacs:clang-8-cuda-10.1:release:build
 
-gromacs:oneapi-2021.1-beta09-opencl:release:test:
+gromacs:oneapi-2021.1.1-opencl:release:test:
   extends:
     - .gromacs:base:test
     - .use-oneapi:base
     - .rules:nightly-only-for-release
   stage: release-tests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     BUILD_DIR: release-builds-oneapi
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-opencl:release:configure
-    - job: gromacs:oneapi-2021.1-beta09-opencl:release:build
+    - job: gromacs:oneapi-2021.1.1-opencl:release:configure
+    - job: gromacs:oneapi-2021.1.1-opencl:release:build
 
-gromacs:gcc-7:release:regressiontest:
+gromacs:gcc-9:release:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .rules:nightly-only-for-release
   stage: release-tests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9
   variables:
     CMAKE: /usr/local/cmake-3.13.0/bin/cmake
     BUILD_DIR: release-builds-gcc
@@ -1235,7 +1279,7 @@ gromacs:gcc-7:release:regressiontest:
   tags:
     - k8s-scilifelab
   needs:
-    - job: gromacs:gcc-7:release:build
+    - job: gromacs:gcc-9:release:build
     - job: regressiontests:package
 
 gromacs:clang-9:release:regressiontest:
@@ -1274,13 +1318,13 @@ gromacs:clang-8-cuda-10.1:release:regressiontest:
     - job: gromacs:clang-8-cuda-10.1:release:build
     - job: regressiontests:package
 
-gromacs:oneapi-2021.1-beta09-opencl:release:regressiontest:
+gromacs:oneapi-2021.1.1-opencl:release:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .use-oneapi:base
     - .rules:nightly-only-for-release
   stage: release-tests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1-beta09
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     BUILD_DIR: release-builds-oneapi
@@ -1288,5 +1332,5 @@ gromacs:oneapi-2021.1-beta09-opencl:release:regressiontest:
     REGRESSIONTEST_TOTAL_RANK_NUMBER: 2
     REGRESSIONTEST_OMP_RANK_NUMBER: 1
   needs:
-    - job: gromacs:oneapi-2021.1-beta09-opencl:release:build
+    - job: gromacs:oneapi-2021.1.1-opencl:release:build
     - job: regressiontests:package
Local GROMACS mirror with custom stuff