From: Paul Bauer Date: Mon, 8 Feb 2021 17:40:49 +0000 (+0000) Subject: Tag images on the branch as release-2021 X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=094f0f6e01b2f5e3089f4278990d4d12d4834fd7;p=alexxy%2Fgromacs.git Tag images on the branch as release-2021 This makes sure we can change images for master without affecting the stable branch. Refs #3716 --- diff --git a/admin/containers/buildall.sh b/admin/containers/buildall.sh index ba8759ee64..1dd359dbcc 100644 --- a/admin/containers/buildall.sh +++ b/admin/containers/buildall.sh @@ -30,7 +30,7 @@ echo for arg_string in "${args[@]}"; do # shellcheck disable=SC2086 - tag=$(python3 -m utility $arg_string) + tag=$(python3 -m utility $arg_string):release-2021 tags[${#tags[@]}]=$tag # shellcheck disable=SC2086 python3 $SCRIPT $arg_string | docker build -t $tag - diff --git a/admin/gitlab-ci/archive.gitlab-ci.yml b/admin/gitlab-ci/archive.gitlab-ci.yml index 4b2cb78693..8a582e5cb2 100644 --- a/admin/gitlab-ci/archive.gitlab-ci.yml +++ b/admin/gitlab-ci/archive.gitlab-ci.yml @@ -5,7 +5,7 @@ prepare-release-version: - .variables:default - .rules:nightly-only-for-release cache: {} - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 stage: configure-build variables: KUBERNETES_CPU_LIMIT: 1 @@ -25,7 +25,7 @@ regressiontests:prepare: - .variables:default - .rules:merge-and-post-merge-acceptance cache: {} - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 stage: configure-build variables: KUBERNETES_CPU_LIMIT: 1 @@ -69,7 +69,7 @@ regressiontests:package: cache: {} # Docker image uploaded to dockerhub by user eriklindahl # TODO: Get DockerFile for admin/dockerfiles - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 stage: release-package variables: KUBERNETES_CPU_LIMIT: 1 @@ -143,7 +143,7 @@ archive:configure:release: - .use-ccache - .before_script:default - .docs:build - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 variables: KUBERNETES_CPU_LIMIT: 4 KUBERNETES_CPU_REQUEST: 2 @@ -206,7 +206,7 @@ archive:package: BUILD_DIR: build-package release-verify: - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 stage: release-verify extends: - .variables:default diff --git a/admin/gitlab-ci/documentation.gitlab-ci.yml b/admin/gitlab-ci/documentation.gitlab-ci.yml index 36ce9b6ea3..785dee9df7 100644 --- a/admin/gitlab-ci/documentation.gitlab-ci.yml +++ b/admin/gitlab-ci/documentation.gitlab-ci.yml @@ -6,7 +6,7 @@ - .gromacs:base:configure - .before_script:default # TODO (#3480) this should be organized more like the current documentation.py script - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 stage: configure-build cache: {} variables: @@ -72,7 +72,7 @@ - .before_script:default - .rules:nightly-only-for-release # TODO (#3480) this should be organized more like the current documentation.py script - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 stage: release-configure cache: {} variables: @@ -182,7 +182,7 @@ docs:configure: .docs:build: # TODO (#3480) this should be organized more like the current documentation.py script - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 script: - cd $BUILD_DIR - cmake --build . --target gmx -- -j8 @@ -222,7 +222,7 @@ docs:build: - .gromacs:base:build - .before_script:default # TODO (#3480) this should be organized more like the current documentation.py script - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 cache: {} variables: KUBERNETES_CPU_LIMIT: 4 diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml index b2e2dd56e7..f757202877 100644 --- a/admin/gitlab-ci/gromacs.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml @@ -20,7 +20,7 @@ simple-build: - .use-clang:base - .rules:basic-push stage: pre-build - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake KUBERNETES_CPU_LIMIT: 8 diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.0.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.0.gitlab-ci.yml index acedae27df..3b93ad7012 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.0.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.0.gitlab-ci.yml @@ -21,7 +21,7 @@ gromacs:clang-8-cuda-10.0:configure: - .use-clang:base - .use-cuda - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake CMAKE_SIMD_OPTIONS: "-DGMX_USE_SIMD_KERNELS=off" @@ -36,7 +36,7 @@ gromacs:clang-8-cuda-10.0:build: - .use-clang:base - .use-ccache - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake needs: @@ -46,7 +46,7 @@ gromacs:clang-8-cuda-10.0:test: extends: - .gromacs:base:test - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" @@ -60,7 +60,7 @@ gromacs:clang-8-cuda-10.0:regressiontest: extends: - .gromacs:base:regressiontest - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml index e6ea8183bf..cf86e4c04f 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml @@ -21,7 +21,7 @@ gromacs:clang-8-cuda-10.1:release:configure: - .use-clang:base - .use-cuda - .rules:nightly-only-for-release - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.1:release-2021 variables: COMPILER_MAJOR_VERSION: 8 RELEASE_BUILD_DIR: release-builds-clang @@ -37,7 +37,7 @@ gromacs:clang-8-cuda-10.1:release:build: stage: release-build variables: BUILD_DIR: release-builds-clang - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.1:release-2021 needs: - job: gromacs:clang-8-cuda-10.1:release:configure @@ -46,7 +46,7 @@ gromacs:clang-8-cuda-10.1:release:test: - .gromacs:base:test - .rules:nightly-only-for-release stage: release-tests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.1:release-2021 variables: KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 @@ -62,7 +62,7 @@ gromacs:clang-8-cuda-10.1:release:regressiontest: - .gromacs:base:regressiontest - .rules:nightly-only-for-release stage: release-tests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.1:release-2021 variables: BUILD_DIR: release-builds-clang KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8.gitlab-ci.yml index 5a590b9701..47def43229 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8.gitlab-ci.yml @@ -18,7 +18,7 @@ gromacs:clang-8:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0:release-2021 variables: COMPILER_MAJOR_VERSION: 8 @@ -29,7 +29,7 @@ gromacs:clang-8:build: - .before_script:default - .use-ccache - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0:release-2021 needs: - job: gromacs:clang-8:configure @@ -37,7 +37,7 @@ gromacs:clang-8:test: extends: - .gromacs:base:test - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0:release-2021 needs: - job: gromacs:clang-8:build @@ -45,7 +45,7 @@ gromacs:clang-8:regressiontest: extends: - .gromacs:base:regressiontest - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0:release-2021 tags: - k8s-scilifelab needs: diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-mpi.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-mpi.gitlab-ci.yml index 81f3e1f98a..d7c2682283 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-mpi.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-mpi.gitlab-ci.yml @@ -21,7 +21,7 @@ gromacs:clang-9-mpi:configure: - .use-clang:base - .use-mpi - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake COMPILER_MAJOR_VERSION: 9 @@ -36,7 +36,7 @@ gromacs:clang-9-mpi:build: - .before_script:default - .use-ccache - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake needs: @@ -46,7 +46,7 @@ gromacs:clang-9-mpi:test: extends: - .gromacs:base:test - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake tags: @@ -58,7 +58,7 @@ gromacs:clang-9:regressiontest: extends: - .gromacs:base:regressiontest - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake REGRESSIONTEST_DOUBLE: "-double" diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-release.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-release.gitlab-ci.yml index c6c77685b3..943ad08d40 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-release.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-release.gitlab-ci.yml @@ -21,7 +21,7 @@ gromacs:clang-9:release:configure: - .use-clang:base - .use-mpi - .rules:nightly-only-for-release - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake COMPILER_MAJOR_VERSION: 9 @@ -44,7 +44,7 @@ gromacs:clang-9:release:build: variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake BUILD_DIR: release-builds-clang - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 needs: - job: gromacs:clang-9:release:configure @@ -53,7 +53,7 @@ gromacs:clang-9:release:test: - .gromacs:base:test - .rules:nightly-only-for-release stage: release-tests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake BUILD_DIR: release-builds-clang @@ -66,7 +66,7 @@ gromacs:clang-9:release:regressiontest: - .gromacs:base:regressiontest - .rules:nightly-only-for-release stage: release-tests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake BUILD_DIR: release-builds-clang diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml index 3052a6298f..b9a3c7f21b 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml @@ -18,7 +18,7 @@ gromacs:clang-ASAN:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake COMPILER_MAJOR_VERSION: 8 @@ -31,7 +31,7 @@ gromacs:clang-ASAN:build: - .use-clang:base - .use-ccache - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake tags: @@ -44,7 +44,7 @@ gromacs:clang-ASAN:test: - .gromacs:base:test - .use-clang:base - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake CTEST_RUN_MODE: "ExperimentalMemCheck" @@ -58,7 +58,7 @@ gromacs:clang-ASAN:regressiontest: - .gromacs:base:regressiontest - .use-clang:base - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake tags: diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-TSAN.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-TSAN.gitlab-ci.yml index 64834ff427..53073f8171 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-TSAN.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-TSAN.gitlab-ci.yml @@ -18,7 +18,7 @@ gromacs:clang-TSAN:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake COMPILER_MAJOR_VERSION: 8 @@ -31,7 +31,7 @@ gromacs:clang-TSAN:build: - .use-clang:base - .use-ccache - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake needs: @@ -41,7 +41,7 @@ gromacs:clang-TSAN:test: extends: - .gromacs:base:test - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake needs: @@ -51,7 +51,7 @@ gromacs:clang-TSAN:regressiontest: extends: - .gromacs:base:regressiontest - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake tags: diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-UBSAN.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-UBSAN.gitlab-ci.yml index 8676952bee..e0588ca2b7 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-UBSAN.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-UBSAN.gitlab-ci.yml @@ -18,7 +18,7 @@ gromacs:clang-UBSAN:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake COMPILER_MAJOR_VERSION: 8 @@ -31,7 +31,7 @@ gromacs:clang-UBSAN:build: - .use-clang:base - .use-ccache - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake tags: @@ -44,7 +44,7 @@ gromacs:clang-UBSAN:test: - .gromacs:base:test - .use-clang:base - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake tags: diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-static-analyzer.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-static-analyzer.gitlab-ci.yml index 0d6624c59c..7168a6a348 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-static-analyzer.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-static-analyzer.gitlab-ci.yml @@ -17,7 +17,7 @@ gromacs:clang-static-analyzer:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake CMAKE_COMPILER_SCRIPT: "-DCMAKE_CXX_COMPILER=/usr/local/libexec/c++-analyzer -DCMAKE_C_COMPILER=gcc" @@ -31,7 +31,7 @@ gromacs:clang-static-analyzer:build: - .use-clang:base - .use-ccache - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-tsan:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake tags: diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-10.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-10.gitlab-ci.yml index 0b4f7a7f9b..725b57a2df 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-10.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-10.gitlab-ci.yml @@ -21,7 +21,7 @@ gromacs:gcc-10:configure: - .use-gcc:base - .use-opencl - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=AVX2_256" @@ -35,7 +35,7 @@ gromacs:gcc-10:build: - .before_script:default - .use-ccache - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake needs: @@ -45,7 +45,7 @@ gromacs:gcc-10:test: extends: - .gromacs:base:test - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "amd.com/gpu" @@ -60,7 +60,7 @@ gromacs:gcc-10:regressiontest: extends: - .gromacs:base:regressiontest - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "amd.com/gpu" diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-7-cuda-10.2.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-7-cuda-10.2.gitlab-ci.yml index 41ed3989a0..b898aacb79 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-7-cuda-10.2.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-7-cuda-10.2.gitlab-ci.yml @@ -26,7 +26,7 @@ gromacs:gcc-7-cuda-10.2:configure: - .use-gcc:base - .use-cuda - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=SSE4.1" @@ -39,7 +39,7 @@ gromacs:gcc-7-cuda-10.2:build: - .before_script:default - .use-ccache - .rules:merge-and-post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake needs: @@ -49,7 +49,7 @@ gromacs:gcc-7-cuda-10.2:test: extends: - .gromacs:base:test - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" @@ -63,7 +63,7 @@ gromacs:gcc-7-cuda-10.2:test-gpucommupd: extends: - .gromacs:base:test - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" @@ -80,7 +80,7 @@ gromacs:gcc-7-cuda-10.2:regressiontest: extends: - .gromacs:base:regressiontest - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" @@ -98,7 +98,7 @@ 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-7-cuda-10.2 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" @@ -124,7 +124,7 @@ 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-7-cuda-10.2 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-cuda-10.2:release-2021 variables: KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 2 diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-8-cuda-11.0-release.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-8-cuda-11.0-release.gitlab-ci.yml index b2e302b486..9b91166100 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-8-cuda-11.0-release.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-8-cuda-11.0-release.gitlab-ci.yml @@ -22,7 +22,7 @@ gromacs:gcc-8-cuda-11.0:release:configure: - .use-mpi - .use-cuda - .rules:nightly-only-for-release - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake COMPILER_MAJOR_VERSION: 8 @@ -46,7 +46,7 @@ gromacs:gcc-8-cuda-11.0:release:build: variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake BUILD_DIR: release-builds-gcc - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0:release-2021 needs: - job: gromacs:gcc-8-cuda-11.0:release:configure @@ -55,7 +55,7 @@ gromacs:gcc-8-cuda-11.0:release:test: - .gromacs:base:test - .rules:nightly-only-for-release stage: release-tests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-8-cuda-11.0:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-8-cuda-11.0.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-8-cuda-11.0.gitlab-ci.yml index 59a8e11160..5daeb61379 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-8-cuda-11.0.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-8-cuda-11.0.gitlab-ci.yml @@ -22,7 +22,7 @@ gromacs:gcc-8-cuda-11.0:configureMPI: - .use-cuda - .use-mpi - .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-8-cuda-11.0:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=SSE4.1" @@ -35,7 +35,7 @@ gromacs:gcc-8-cuda-11.0:buildMPI: - .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-8-cuda-11.0:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake needs: @@ -47,7 +47,7 @@ gromacs:gcc-8-cuda-11.0:regressiontest-gpucommupd-MPI: 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-8-cuda-11.0:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-9-release.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-9-release.gitlab-ci.yml index 4e05b53ede..7ee3fe6d41 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-9-release.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-9-release.gitlab-ci.yml @@ -20,7 +20,7 @@ gromacs:gcc-9:release:configure: - .use-gcc:base - .use-opencl - .rules:nightly-only-for-release - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake COMPILER_MAJOR_VERSION: 9 @@ -44,7 +44,7 @@ gromacs:gcc-9: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-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9:release-2021 needs: - job: gromacs:gcc-9:release:configure @@ -53,7 +53,7 @@ gromacs:gcc-9:release:test: - .gromacs:base:test - .rules:nightly-only-for-release stage: release-tests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake BUILD_DIR: release-builds-gcc @@ -71,7 +71,7 @@ gromacs:gcc-9:release:regressiontest: - .gromacs:base:regressiontest - .rules:nightly-only-for-release stage: release-tests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-9:release-2021 variables: CMAKE: /usr/local/cmake-3.13.0/bin/cmake BUILD_DIR: release-builds-gcc diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.icc-2021.1.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.icc-2021.1.gitlab-ci.yml index 849eb19aea..fe3fd839ea 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.icc-2021.1.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.icc-2021.1.gitlab-ci.yml @@ -21,7 +21,7 @@ gromacs:icc-2021.1:configure: - .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 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake COMPILER_MAJOR_VERSION: 2021 @@ -32,7 +32,7 @@ gromacs:icc-2021.1:build: - .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 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: @@ -43,7 +43,7 @@ gromacs:icc-2021.1:test: - .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 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: @@ -54,7 +54,7 @@ gromacs:icc-2021.1:regressiontest: - .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 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml index db672a5f23..13d5646a2c 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml @@ -20,7 +20,7 @@ gromacs:oneapi-2021.1.1-opencl: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.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake COMPILER_MAJOR_VERSION: 2021 @@ -39,7 +39,7 @@ gromacs:oneapi-2021.1.1-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.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 needs: - job: gromacs:oneapi-2021.1.1-opencl:release:configure @@ -49,7 +49,7 @@ gromacs:oneapi-2021.1.1-opencl:release: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.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake BUILD_DIR: release-builds-oneapi @@ -63,7 +63,7 @@ gromacs:oneapi-2021.1.1-opencl:release: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.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake BUILD_DIR: release-builds-oneapi diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml index 4f304b8372..de2009819f 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml @@ -19,7 +19,7 @@ gromacs:oneapi-2021.1.1-opencl:configure: - .use-oneapi:base - .use-opencl - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake COMPILER_MAJOR_VERSION: 2021 @@ -31,7 +31,7 @@ gromacs:oneapi-2021.1.1-opencl:build: - .use-ccache - .use-oneapi:base - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: @@ -42,7 +42,7 @@ gromacs:oneapi-2021.1.1-opencl:test: - .gromacs:base:test - .use-oneapi:base - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: @@ -53,7 +53,7 @@ gromacs:oneapi-2021.1.1-opencl:regressiontest: - .gromacs:base:regressiontest - .use-oneapi:base - .rules:merge-requests - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml index 5f01e0d579..9c923031e4 100644 --- a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml @@ -19,7 +19,7 @@ gromacs:oneapi-2021.1.1-sycl: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.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake COMPILER_MAJOR_VERSION: 2021 @@ -31,7 +31,7 @@ gromacs:oneapi-2021.1.1-sycl: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.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: @@ -42,7 +42,7 @@ gromacs:oneapi-2021.1.1-sycl:test: - .gromacs:base:test - .use-oneapi:base - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: @@ -53,7 +53,7 @@ gromacs:oneapi-2021.1.1-sycl:regressiontest: - .gromacs:base:regressiontest - .use-oneapi:base - .rules:post-merge-acceptance - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-gcc-7-oneapi-2021.1.1:release-2021 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml index 560e5cb991..b3a720ace8 100644 --- a/admin/gitlab-ci/lint.gitlab-ci.yml +++ b/admin/gitlab-ci/lint.gitlab-ci.yml @@ -5,7 +5,7 @@ clang-tidy:configure-push: - .gromacs:base:configure - .use-clang:base - .rules:basic-push - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake COMPILER_MAJOR_VERSION: 9 @@ -17,7 +17,7 @@ clang-tidy:configure-schedule: - .gromacs:base:configure - .use-clang:base - .rules:nightly-not-for-release - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 variables: CMAKE: /usr/local/cmake-3.15.7/bin/cmake COMPILER_MAJOR_VERSION: 9 @@ -31,7 +31,7 @@ clang-tidy:build: - .variables:default - .rules:nightly-not-for-release stage: source-check - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 needs: - job: clang-tidy:configure-schedule variables: @@ -44,7 +44,7 @@ clang-tidy:test: - .variables:default - .rules:basic-push stage: source-check - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9:release-2021 needs: - job: clang-tidy:configure-push variables: @@ -81,7 +81,7 @@ clang-format: - .rules:basic-push cache: {} stage: pre-build - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 variables: COMPILER_MAJOR_VERSION: 7 KUBERNETES_CPU_LIMIT: 1 @@ -111,7 +111,7 @@ copyright-check: - .rules:basic-push cache: {} stage: pre-build - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs:release-2021 variables: KUBERNETES_CPU_LIMIT: 1 KUBERNETES_CPU_REQUEST: 1 diff --git a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml index 32de191be5..f408238641 100644 --- a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml +++ b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml @@ -8,7 +8,7 @@ - .variables:default - .use-clang:base stage: test - image: ${CI_REGISTRY}/gromacs/gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020 + image: ${CI_REGISTRY}/gromacs/gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020:release-2021 variables: KUBERNETES_CPU_LIMIT: 2 KUBERNETES_CPU_REQUEST: 2 @@ -78,7 +78,7 @@ gmxapi-0.1:clang-8:py-3.8.2: extends: - .variables:default - .use-clang:base - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10:release-2021 stage: test variables: KUBERNETES_CPU_LIMIT: 2 diff --git a/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml b/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml index e5d9b0a412..be00e42f7c 100644 --- a/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml +++ b/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml @@ -5,7 +5,7 @@ extends: - .variables:default - .use-clang:base - image: ${CI_REGISTRY}/gromacs/gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020 + image: ${CI_REGISTRY}/gromacs/gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020:release-2021 stage: test variables: KUBERNETES_CPU_LIMIT: 2 diff --git a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml index 629efb245d..13c255b0bc 100644 --- a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml +++ b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml @@ -3,7 +3,7 @@ extends: - .variables:default - .use-clang:base - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10 + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-10:release-2021 stage: test variables: KUBERNETES_CPU_LIMIT: 2