From 840a888763887fdf6b41a59dbc8bc4a2a0971fdb Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Tue, 22 Jun 2021 06:02:59 +0000 Subject: [PATCH] Activate the existing 20.04 CI containers --- admin/gitlab-ci/gromacs.gitlab-ci.yml | 4 ++-- .../gromacs.matrix/gromacs.clang-8.gitlab-ci.yml | 10 +++++----- .../gromacs.matrix/gromacs.clang-9-mpi.gitlab-ci.yml | 10 +++++----- .../gromacs.clang-9-release.gitlab-ci.yml | 10 +++++----- .../gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml | 10 +++++----- .../gromacs.matrix/gromacs.clang-TSAN.gitlab-ci.yml | 10 +++++----- .../gromacs.matrix/gromacs.clang-UBSAN.gitlab-ci.yml | 8 ++++---- .../gromacs.clang-static-analyzer.gitlab-ci.yml | 6 +++--- .../gromacs.gcc-9-release.gitlab-ci.yml | 10 +++++----- ...macs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml | 10 +++++----- .../gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml | 10 +++++----- .../gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml | 10 +++++----- admin/gitlab-ci/lint.gitlab-ci.yml | 12 ++++++------ 13 files changed, 60 insertions(+), 60 deletions(-) diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml index 55b0e1cd17..29b94d6140 100644 --- a/admin/gitlab-ci/gromacs.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml @@ -8,7 +8,7 @@ # SIMD: no # Scope: configure, build, unit tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Compiler: Clang 9 # FFT: FFTW3 # Parallelism nt/ntomp: 4/2 @@ -21,7 +21,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-20.04-llvm-9 variables: CMAKE: /usr/local/cmake-3.16.3/bin/cmake KUBERNETES_CPU_LIMIT: 8 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..6f8eb180d1 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 @@ -5,7 +5,7 @@ # GPU: no # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Build type: Debug # Compiler: Clang 8 # MPI: thread_MPI @@ -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-20.04-llvm-8-cuda-11.0 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-20.04-llvm-8-cuda-11.0 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-20.04-llvm-8-cuda-11.0 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-20.04-llvm-8-cuda-11.0 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 803828a7b1..9f3f5e477d 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 @@ -7,7 +7,7 @@ # Features: double precision FP # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Build type: Debug # Compiler: Clang 9 # MPI: OpenMPI 3.1 @@ -22,7 +22,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-20.04-llvm-9 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake COMPILER_MAJOR_VERSION: 9 @@ -38,7 +38,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-20.04-llvm-9 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake needs: @@ -48,7 +48,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-20.04-llvm-9 variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake tags: @@ -60,7 +60,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-20.04-llvm-9 variables: CMAKE: /usr/local/cmake-3.17.2/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 f2d59a277b..32ad653109 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 @@ -7,7 +7,7 @@ # Features: double precision FP # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Build type: RelWithAssert # Compiler: Clang 9 # MPI: OpenMPI 3.1 @@ -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-20.04-llvm-9 variables: CMAKE: /usr/local/cmake-3.16.3/bin/cmake COMPILER_MAJOR_VERSION: 9 @@ -44,7 +44,7 @@ gromacs:clang-9:release:build: variables: CMAKE: /usr/local/cmake-3.16.3/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-20.04-llvm-9 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-20.04-llvm-9 variables: CMAKE: /usr/local/cmake-3.16.3/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-20.04-llvm-9 variables: CMAKE: /usr/local/cmake-3.16.3/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 78d0dcec3c..96eb110abe 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 @@ -6,7 +6,7 @@ # GPU: no # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Compiler: Clang 11 # MPI: thread_MPI # SIMD: AVX2_256 @@ -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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.18.4/bin/cmake COMPILER_MAJOR_VERSION: 11 @@ -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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.18.4/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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.18.4/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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.18.4/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 0ea46d802f..61ea771233 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 @@ -6,7 +6,7 @@ # GPU: None # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Compiler: Clang 11 # MPI: thread_MPI # SIMD: AVX2_256 @@ -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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.17.2/bin/cmake COMPILER_MAJOR_VERSION: 11 @@ -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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.17.2/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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.17.2/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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.17.2/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 75bbd7a00d..83e05b5935 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 @@ -6,7 +6,7 @@ # GPU: no # Scope: configure, build, unit tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Compiler: Clang 11 # MPI: thread_MPI # SIMD: AVX2_256 @@ -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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.18.4/bin/cmake COMPILER_MAJOR_VERSION: 11 @@ -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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.18.4/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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.18.4/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 61ea460f0f..39536fb831 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 @@ -9,7 +9,7 @@ # MPI: thread_MPI # Scope: configure, build # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Compiler: Clang 8 gromacs:clang-static-analyzer:configure: @@ -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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.16.3/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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.16.3/bin/cmake tags: 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 4de9ff7a5c..846f36aaa5 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 @@ -6,7 +6,7 @@ # HW: AMD GPU # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Build type: RelWithAssert # Compiler: GCC 9 # MPI: thread_MPI @@ -21,7 +21,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-20.04-gcc-9 variables: CMAKE: /usr/local/cmake-3.16.3/bin/cmake COMPILER_MAJOR_VERSION: 9 @@ -45,7 +45,7 @@ gromacs:gcc-9:release:build: variables: CMAKE: /usr/local/cmake-3.16.3/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-20.04-gcc-9 needs: - job: gromacs:gcc-9:release:configure @@ -54,7 +54,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-20.04-gcc-9 variables: CMAKE: /usr/local/cmake-3.16.3/bin/cmake BUILD_DIR: release-builds-gcc @@ -72,7 +72,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-20.04-gcc-9 variables: CMAKE: /usr/local/cmake-3.16.3/bin/cmake BUILD_DIR: release-builds-gcc 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..1602123230 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 @@ -7,7 +7,7 @@ # GPU: OpenCL # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Compiler: ICPX 2021.1 # MPI: thread_MPI # SIMD: AVX2_256 @@ -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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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..78d5bd2b24 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 @@ -6,7 +6,7 @@ # GPU: OpenCL # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Build type: Debug # Compiler: ICPX 2021.1 # MPI: thread_MPI @@ -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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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..b2f4024ff7 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 @@ -6,7 +6,7 @@ # GPU: SYCL # Scope: configure, build, unit tests, regression tests # Test implementation choices (free to change as needed): -# OS: Ubuntu 18.04 +# OS: Ubuntu 20.04 # Build type: Debug # Compiler: ICPX 2021.1 # MPI: thread_MPI @@ -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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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-20.04-gcc-7-oneapi-2021.1.1 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 8fc2ea3304..70ef8d8716 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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.16.3/bin/cmake COMPILER_MAJOR_VERSION: 11 @@ -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-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: CMAKE: /usr/local/cmake-3.16.3/bin/cmake COMPILER_MAJOR_VERSION: 11 @@ -44,7 +44,7 @@ clang-tidy:build: - .variables:default - .rules:nightly-not-for-release stage: source-check - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan needs: - job: clang-tidy:configure-schedule variables: @@ -71,7 +71,7 @@ clang-tidy:test: - .variables:default - .rules:basic-push stage: source-check - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan needs: - job: clang-tidy:configure-push variables: @@ -108,7 +108,7 @@ clang-format: - .rules:basic-push cache: {} stage: pre-build - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: COMPILER_MAJOR_VERSION: 11 KUBERNETES_CPU_LIMIT: 1 @@ -139,7 +139,7 @@ copyright-check: - .rules:basic-push cache: {} stage: pre-build - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-11-tsan + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan variables: KUBERNETES_CPU_LIMIT: 1 KUBERNETES_CPU_REQUEST: 1 -- 2.22.0