From e0a2bf12ca94fe380d52c6cd59c5d381d88e4324 Mon Sep 17 00:00:00 2001 From: "M. Eric Irrgang" Date: Fri, 31 Jul 2020 16:31:09 +0300 Subject: [PATCH] Normalize docker image names. Change the name of the DockerHub image repository name to include the name of the supported branch. Leave the tag unspecified when naming the built images and when referencing images for CI jobs to get the standard imagePullPolicy for the `latest` tag. See also: https://kubernetes.io/docs/concepts/configuration/overview/#container-images Fixes #3618 --- admin/containers/buildall.sh | 18 ++--- admin/gitlab-ci/archive.gitlab-ci.yml | 2 +- admin/gitlab-ci/documentation.gitlab-ci.yml | 8 +- admin/gitlab-ci/gromacs.gitlab-ci.yml | 82 ++++++++++----------- admin/gitlab-ci/lint.gitlab-ci.yml | 12 +-- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/admin/containers/buildall.sh b/admin/containers/buildall.sh index 2c74578620..590b3b88c8 100644 --- a/admin/containers/buildall.sh +++ b/admin/containers/buildall.sh @@ -9,40 +9,40 @@ SCRIPT=$PWD/scripted_gmx_docker_builds.py # images needed, because the same one can test library, # thread and no MPI configurations. -tag="gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master" +tag="gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.15.7 --gcc 8 --cuda 10.1 --opencl --clfft --mpi openmpi \ | docker build -t $tag - -tag="gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master" +tag="gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.13.0 --gcc 7 --opencl amd --clfft --mpi openmpi | docker build -t $tag - -tag="gromacs/cmake-3.13.0-llvm-8-tsan:master" +tag="gromacs/cmake-3.13.0-llvm-8-tsan-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.13.0 --llvm 8 --tsan | docker build -t $tag - -tag="gromacs/cmake-3.15.7-llvm-8-cuda-10.0-openmpi:master" +tag="gromacs/cmake-3.15.7-llvm-8-cuda-10.0-openmpi-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.15.7 --llvm 8 --cuda 10.0 --mpi openmpi | docker build -t $tag - -tag="gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi:master" +tag="gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.15.7 --llvm 8 --cuda 10.1 --mpi openmpi | docker build -t $tag - -tag="gromacs/cmake-3.15.7-llvm-9-openmpi:master" +tag="gromacs/cmake-3.15.7-llvm-9-openmpi-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.15.7 --llvm 9 --mpi openmpi | docker build -t $tag - -tag="gromacs/cmake-3.13.0-llvm-9-intelopencl-openmpi:master" +tag="gromacs/cmake-3.13.0-llvm-9-intelopencl-openmpi-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.13.0 --llvm 9 --opencl intel --mpi openmpi | docker build -t $tag - -tag="gromacs/cmake-3.13.0-llvm-9-amdopencl-openmpi:master" +tag="gromacs/cmake-3.13.0-llvm-9-amdopencl-openmpi-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.13.0 --llvm 9 --opencl amd --mpi openmpi | docker build -t $tag - -tag=gromacs/ci-docs-llvm:master +tag="gromacs/ci-docs-llvm-master" tags[${#tags[@]}]=$tag python3 $SCRIPT --cmake 3.17.2 --llvm --doxygen | docker build -t $tag - diff --git a/admin/gitlab-ci/archive.gitlab-ci.yml b/admin/gitlab-ci/archive.gitlab-ci.yml index 39fd0e2ba9..ff9b522a65 100644 --- a/admin/gitlab-ci/archive.gitlab-ci.yml +++ b/admin/gitlab-ci/archive.gitlab-ci.yml @@ -145,7 +145,7 @@ archive:configure:release: - .use-ccache - .before_script:default - .docs:build - image: gromacs/ci-docs-llvm:master + image: gromacs/ci-docs-llvm-master variables: KUBERNETES_CPU_LIMIT: 4 KUBERNETES_CPU_REQUEST: 2 diff --git a/admin/gitlab-ci/documentation.gitlab-ci.yml b/admin/gitlab-ci/documentation.gitlab-ci.yml index 0e3459d9ef..4087a7c8cb 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: gromacs/ci-docs-llvm:master + image: gromacs/ci-docs-llvm-master stage: configure-build cache: {} variables: @@ -73,7 +73,7 @@ - .before_script:default - .rules:nightly-only-for-release # TODO (#3480) this should be organized more like the current documentation.py script - image: gromacs/ci-docs-llvm:master + image: gromacs/ci-docs-llvm-master stage: release-configure cache: {} variables: @@ -184,7 +184,7 @@ docs:configure: .docs:build: # TODO (#3480) this should be organized more like the current documentation.py script - image: gromacs/ci-docs-llvm:master + image: gromacs/ci-docs-llvm-master script: - cd $BUILD_DIR - cmake --build . --target gmx -- -j8 @@ -224,7 +224,7 @@ docs:build: - .gromacs:base:build - .before_script:default # TODO (#3480) this should be organized more like the current documentation.py script - image: gromacs/ci-docs-llvm:master + image: gromacs/ci-docs-llvm-master 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 cdfac71532..84f1008ce3 100644 --- a/admin/gitlab-ci/gromacs.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml @@ -8,7 +8,7 @@ simple-build: - .use-clang:base - .rules:basic-push stage: pre-build - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master variables: KUBERNETES_CPU_LIMIT: 8 KUBERNETES_CPU_REQUEST: 4 @@ -222,7 +222,7 @@ gromacs:gcc-7:configure: - .use-gcc:base - .use-opencl - .rules:merge-requests - image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master + image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master variables: CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=AVX2_256" CMAKE_EXTRA_OPTIONS: "-DGMX_EXTERNAL_CLFFT=ON" @@ -234,7 +234,7 @@ gromacs:gcc-8-cuda-10.1:configure: - .use-gcc:base - .use-cuda - .rules:merge-requests - image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master + image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi-master variables: CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=SSE4.1" COMPILER_MAJOR_VERSION: 8 @@ -244,7 +244,7 @@ gromacs:clang-TSAN:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master variables: COMPILER_MAJOR_VERSION: 8 CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=TSAN" @@ -264,7 +264,7 @@ gromacs:clang-9-mpi:configure: - .use-clang:base - .use-mpi - .rules:merge-requests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master variables: COMPILER_MAJOR_VERSION: 9 CMAKE_PRECISION_OPTIONS: -DGMX_DOUBLE=ON @@ -274,7 +274,7 @@ gromacs:clang-static-analyzer:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master variables: CMAKE_COMPILER_SCRIPT: "-DCMAKE_CXX_COMPILER=/usr/local/libexec/c++-analyzer -DCMAKE_C_COMPILER=gcc" CMAKE_EXTRA_OPTIONS: "-DGMX_CLANG_ANALYZER=ON -DGMX_OPENMP=OFF -DGMX_USE_RDTSCP=OFF -DGMX_FFT_LIBRARY=fftpack -DGMX_DEVELOPER_BUILD=ON" @@ -285,7 +285,7 @@ gromacs:clang-ASAN:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master variables: COMPILER_MAJOR_VERSION: 8 CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=ASAN" @@ -295,7 +295,7 @@ gromacs:clang-UBSAN:configure: - .gromacs:base:configure - .use-clang:base - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master variables: COMPILER_MAJOR_VERSION: 8 CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=UBSAN" @@ -307,7 +307,7 @@ gromacs:gcc-8-cuda-10.1:release:configure: - .use-mpi - .use-cuda - .rules:nightly-only-for-release - image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master + image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi-master variables: COMPILER_MAJOR_VERSION: 8 RELEASE_BUILD_DIR: release-builds-gcc @@ -324,7 +324,7 @@ gromacs:gcc-7:release:configure: - .gromacs:base:release:configure - .use-gcc:base - .rules:nightly-only-for-release - image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master + image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master variables: COMPILER_MAJOR_VERSION: 7 RELEASE_BUILD_DIR: release-builds-gcc @@ -340,7 +340,7 @@ gromacs:clang-9:release:configure: - .use-clang:base - .use-mpi - .rules:nightly-only-for-release - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master variables: COMPILER_MAJOR_VERSION: 9 RELEASE_BUILD_DIR: release-builds-clang @@ -357,7 +357,7 @@ gromacs:clang-8-cuda-10.1:release:configure: - .use-clang:base - .use-cuda - .rules:nightly-only-for-release - image: gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi:master + image: gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi-master variables: COMPILER_MAJOR_VERSION: 8 RELEASE_BUILD_DIR: release-builds-clang @@ -405,7 +405,7 @@ gromacs:gcc-7:build: - .before_script:default - .use-ccache - .rules:merge-requests - image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master + image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master needs: - job: gromacs:gcc-7:configure artifacts: true @@ -417,7 +417,7 @@ gromacs:gcc-8-cuda-10.1:build: - .before_script:default - .use-ccache - .rules:merge-requests - image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master + image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi-master needs: - job: gromacs:gcc-8-cuda-10.1:configure @@ -428,7 +428,7 @@ gromacs:clang-TSAN:build: - .use-clang:base - .use-ccache - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master needs: - job: gromacs:clang-TSAN:configure @@ -439,7 +439,7 @@ gromacs:clang-ASAN:build: - .use-clang:base - .use-ccache - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master tags: - k8s-scilifelab needs: @@ -452,7 +452,7 @@ gromacs:clang-UBSAN:build: - .use-clang:base - .use-ccache - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master tags: - k8s-scilifelab needs: @@ -465,7 +465,7 @@ gromacs:clang-static-analyzer:build: - .use-clang:base - .use-ccache - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master tags: - k8s-scilifelab needs: @@ -489,7 +489,7 @@ gromacs:clang-9-mpi:build: - .before_script:default - .use-ccache - .rules:merge-requests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master needs: - job: gromacs:clang-9-mpi:configure @@ -503,7 +503,7 @@ gromacs:gcc-8-cuda-10.1:release:build: stage: release-build variables: BUILD_DIR: release-builds-gcc - image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master + image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi-master needs: - job: gromacs:gcc-8-cuda-10.1:release:configure @@ -517,7 +517,7 @@ gromacs:gcc-7:release:build: stage: release-build variables: BUILD_DIR: release-builds-gcc - image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master + image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master needs: - job: gromacs:gcc-7:release:configure @@ -531,7 +531,7 @@ gromacs:clang-9:release:build: stage: release-build variables: BUILD_DIR: release-builds-clang - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master needs: - job: gromacs:clang-9:release:configure @@ -545,7 +545,7 @@ gromacs:clang-8-cuda-10.1:release:build: stage: release-build variables: BUILD_DIR: release-builds-clang - image: gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi:master + image: gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi-master needs: - job: gromacs:clang-8-cuda-10.1:release:configure @@ -622,7 +622,7 @@ gromacs:gcc-7:test: extends: - .gromacs:base:test - .rules:merge-requests - image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master + image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master variables: KUBERNETES_EXTENDED_RESOURCE_NAME: "amd.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 @@ -635,7 +635,7 @@ gromacs:gcc-8-cuda-10.1:test: extends: - .gromacs:base:test - .rules:merge-requests - image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master + image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi-master variables: KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 @@ -656,7 +656,7 @@ gromacs:clang-TSAN:test: extends: - .gromacs:base:test - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master needs: - job: gromacs:clang-TSAN:build @@ -665,7 +665,7 @@ gromacs:clang-ASAN:test: - .gromacs:base:test - .use-clang:base - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master variables: CTEST_RUN_MODE: "ExperimentalMemCheck" tags: @@ -678,7 +678,7 @@ gromacs:clang-UBSAN:test: - .gromacs:base:test - .use-clang:base - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master tags: - k8s-scilifelab needs: @@ -688,7 +688,7 @@ gromacs:clang-9-mpi:test: extends: - .gromacs:base:test - .rules:merge-requests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master tags: - k8s-scilifelab needs: @@ -698,7 +698,7 @@ gromacs:gcc-7:regressiontest: extends: - .gromacs:base:regressiontest - .rules:merge-requests - image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master + image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master variables: KUBERNETES_EXTENDED_RESOURCE_NAME: "amd.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 @@ -715,7 +715,7 @@ gromacs:gcc-8-cuda-10.1:regressiontest: extends: - .gromacs:base:regressiontest - .rules:merge-requests - image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master + image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi-master variables: KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 @@ -743,7 +743,7 @@ gromacs:clang-TSAN:regressiontest: extends: - .gromacs:base:regressiontest - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master tags: - k8s-scilifelab needs: @@ -755,7 +755,7 @@ gromacs:clang-ASAN:regressiontest: - .gromacs:base:regressiontest - .use-clang:base - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master + image: gromacs/cmake-3.13.0-llvm-8-tsan-master tags: - k8s-scilifelab needs: @@ -766,7 +766,7 @@ gromacs:clang-9:regressiontest: extends: - .gromacs:base:regressiontest - .rules:merge-requests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master variables: REGRESSIONTEST_DOUBLE: "-double" REGRESSIONTEST_PARALLEL: "-np" @@ -781,7 +781,7 @@ gromacs:gcc-8-cuda-10.1:release:test: - .gromacs:base:test - .rules:nightly-only-for-release stage: release-tests - image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master + image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi-master variables: KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 @@ -797,7 +797,7 @@ gromacs:gcc-7:release:test: - .gromacs:base:test - .rules:nightly-only-for-release stage: release-tests - image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master + image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master variables: BUILD_DIR: release-builds-gcc needs: @@ -809,7 +809,7 @@ gromacs:clang-9:release:test: - .gromacs:base:test - .rules:nightly-only-for-release stage: release-tests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master variables: BUILD_DIR: release-builds-clang needs: @@ -821,7 +821,7 @@ gromacs:clang-8-cuda-10.1:release:test: - .gromacs:base:test - .rules:nightly-only-for-release stage: release-tests - image: gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi:master + image: gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi-master variables: KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 @@ -837,7 +837,7 @@ gromacs:gcc-7:release:regressiontest: - .gromacs:base:regressiontest - .rules:nightly-only-for-release stage: release-tests - image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master + image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi-master variables: BUILD_DIR: release-builds-gcc tags: @@ -851,7 +851,7 @@ gromacs:clang-9:release:regressiontest: - .gromacs:base:regressiontest - .rules:nightly-only-for-release stage: release-tests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master variables: BUILD_DIR: release-builds-clang REGRESSIONTEST_DOUBLE: "-double" @@ -867,7 +867,7 @@ gromacs:clang-8-cuda-10.1:release:regressiontest: - .gromacs:base:regressiontest - .rules:nightly-only-for-release stage: release-tests - image: gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi:master + image: gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi-master variables: BUILD_DIR: release-builds-clang KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml index 6b6c48897b..c750d2ca73 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: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master variables: COMPILER_MAJOR_VERSION: 9 BUILD_DIR: build-clang-tidy @@ -16,7 +16,7 @@ clang-tidy:configure-schedule: - .gromacs:base:configure - .use-clang:base - .rules:nightly-not-for-release - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master variables: COMPILER_MAJOR_VERSION: 9 BUILD_DIR: build-clang-tidy @@ -29,7 +29,7 @@ clang-tidy:build: - .variables:default - .rules:nightly-not-for-release stage: source-check - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master needs: - job: clang-tidy:configure-schedule variables: @@ -41,7 +41,7 @@ clang-tidy:test: - .variables:default - .rules:basic-push stage: source-check - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + image: gromacs/cmake-3.15.7-llvm-9-openmpi-master needs: - job: clang-tidy:configure-push variables: @@ -77,7 +77,7 @@ clang-format: - .rules:basic-push cache: {} stage: pre-build - image: gromacs/ci-docs-llvm:master + image: gromacs/ci-docs-llvm-master variables: COMPILER_MAJOR_VERSION: 7 KUBERNETES_CPU_LIMIT: 1 @@ -108,7 +108,7 @@ copyright-check: - .rules:basic-push cache: {} stage: pre-build - image: gromacs/ci-docs-llvm:master + image: gromacs/ci-docs-llvm-master variables: KUBERNETES_CPU_LIMIT: 1 KUBERNETES_CPU_REQUEST: 1 -- 2.22.0