From: Paul Bauer Date: Mon, 29 Jun 2020 20:18:36 +0000 (+0000) Subject: Make everything run on Gitlab infrastructure. X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=af3b2782f26d6bde2975a581de7b3fc8bf69b954;p=alexxy%2Fgromacs.git Make everything run on Gitlab infrastructure. Change-Id: I0cfbc2e287641d9f9e9e1cf3a54c9237a6d6c8e2 --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee10cc660d..47caa4ebe3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,11 +42,11 @@ include: - local: '/admin/gitlab-ci/global.gitlab-ci.yml' - local: '/admin/gitlab-ci/rules.gitlab-ci.yml' # gmxapi Python package. - - local: '/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml' + # - local: '/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml' # Further API validation and usability of sample gmxapi extension package. - - local: '/admin/gitlab-ci/sample_restraint.gitlab-ci.yml' + # - local: '/admin/gitlab-ci/sample_restraint.gitlab-ci.yml' # API regression testing using sample gmxapi extension package. - - local: '/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml' + # - local: '/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml' # Build and test GROMACS in a variety of environments and configurations. # To do: Consider expanding matrix here to improve transparency and reduce file sizes. # E.g. '/admin/gitlab-ci/matrix/clang-8.gitlab-ci.yml diff --git a/admin/gitlab-ci/documentation.gitlab-ci.yml b/admin/gitlab-ci/documentation.gitlab-ci.yml index 0e3459d9ef..18d55cfab7 100644 --- a/admin/gitlab-ci/documentation.gitlab-ci.yml +++ b/admin/gitlab-ci/documentation.gitlab-ci.yml @@ -274,7 +274,6 @@ webpage:configure: - .rules:nightly-only-for-release cache: {} tags: - - k8s-scilifelab dependencies: - archive:package - regressiontests:package @@ -293,7 +292,6 @@ webpage:dependencies: - .rules:nightly-only-for-release stage: release-build tags: - - k8s-scilifelab needs: - job: webpage:configure variables: @@ -305,7 +303,6 @@ webpage:build:release: - .rules:nightly-only-for-release stage: release-prepare-deploy tags: - - k8s-scilifelab dependencies: - webpage:dependencies - webpage:configure diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml index 3802f3dd7f..469778fe9b 100644 --- a/admin/gitlab-ci/gromacs.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml @@ -258,37 +258,37 @@ gromacs:clang-8:configure: variables: COMPILER_MAJOR_VERSION: 8 -gromacs:clang-9-mpi:configure: - extends: - - .gromacs:base:configure - - .use-clang:base - - .use-mpi - - .rules:merge-requests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master - variables: - COMPILER_MAJOR_VERSION: 9 - CMAKE_PRECISION_OPTIONS: -DGMX_DOUBLE=ON - -gromacs:clang-static-analyzer:configure: - extends: - - .gromacs:base:configure - - .use-clang:base - - .rules:merge-requests - 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" - CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=None" - -gromacs:clang-ASAN:configure: - extends: - - .gromacs:base:configure - - .use-clang:base - - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master - variables: - COMPILER_MAJOR_VERSION: 8 - CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=ASAN" + #gromacs:clang-9-mpi:configure: + # extends: + # - .gromacs:base:configure + # - .use-clang:base + # - .use-mpi + # - .rules:merge-requests + # image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + # variables: + # COMPILER_MAJOR_VERSION: 9 + # CMAKE_PRECISION_OPTIONS: -DGMX_DOUBLE=ON + + #gromacs:clang-static-analyzer:configure: + # extends: + # - .gromacs:base:configure + # - .use-clang:base + # - .rules:merge-requests + # 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" + # CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=None" + + #gromacs:clang-ASAN:configure: + # extends: + # - .gromacs:base:configure + # - .use-clang:base + # - .rules:merge-requests + # image: gromacs/cmake-3.13.0-llvm-8-tsan:master + # variables: + # COMPILER_MAJOR_VERSION: 8 + # CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=ASAN" gromacs:gcc-8-cuda-10.1:release:configure: extends: @@ -324,22 +324,22 @@ gromacs:gcc-7:release:configure: - regressiontests:package - prepare-release-version -gromacs:clang-9:release:configure: - extends: - - .gromacs:base:release:configure - - .use-clang:base - - .use-mpi - - .rules:nightly-only-for-release - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master - variables: - COMPILER_MAJOR_VERSION: 9 - RELEASE_BUILD_DIR: release-builds-clang - CMAKE_PRECISION_OPTIONS: "-DGMX_DOUBLE=ON" - CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=RelWithAssert" - dependencies: - - archive:package - - regressiontests:package - - prepare-release-version + #gromacs:clang-9:release:configure: + # extends: + # - .gromacs:base:release:configure + # - .use-clang:base + # - .use-mpi + # - .rules:nightly-only-for-release + # image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + # variables: + # COMPILER_MAJOR_VERSION: 9 + # RELEASE_BUILD_DIR: release-builds-clang + # CMAKE_PRECISION_OPTIONS: "-DGMX_DOUBLE=ON" + # CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=RelWithAssert" + # dependencies: + # - archive:package + # - regressiontests:package + # - prepare-release-version gromacs:clang-8-cuda-10.1:release:configure: extends: @@ -422,31 +422,29 @@ gromacs:clang-TSAN:build: needs: - job: gromacs:clang-TSAN:configure -gromacs:clang-ASAN:build: - extends: - - .variables:default - - .gromacs:base:build - - .use-clang:base - - .use-ccache - - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master - tags: - - k8s-scilifelab - needs: - - job: gromacs:clang-ASAN:configure - -gromacs:clang-static-analyzer:build: - extends: - - .variables:default - - .gromacs:static-analyzer-build - - .use-clang:base - - .use-ccache - - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master - tags: - - k8s-scilifelab - needs: - - job: gromacs:clang-static-analyzer:configure + #gromacs:clang-ASAN:build: + # extends: + # - .variables:default + # - .gromacs:base:build + # - .use-clang:base + # - .use-ccache + # - .rules:merge-requests + # image: gromacs/cmake-3.13.0-llvm-8-tsan:master + # tags: + # needs: + # - job: gromacs:clang-ASAN:configure + + #gromacs:clang-static-analyzer:build: + # extends: + # - .variables:default + # - .gromacs:static-analyzer-build + # - .use-clang:base + # - .use-ccache + # - .rules:merge-requests + # image: gromacs/cmake-3.13.0-llvm-8-tsan:master + # tags: + # needs: + # - job: gromacs:clang-static-analyzer:configure gromacs:clang-8:build: extends: @@ -459,16 +457,16 @@ gromacs:clang-8:build: needs: - job: gromacs:clang-8:configure -gromacs:clang-9-mpi:build: - extends: - - .variables:default - - .gromacs:base:build - - .before_script:default - - .use-ccache - - .rules:merge-requests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master - needs: - - job: gromacs:clang-9-mpi:configure + #gromacs:clang-9-mpi:build: + # extends: + # - .variables:default + # - .gromacs:base:build + # - .before_script:default + # - .use-ccache + # - .rules:merge-requests + # image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + # needs: + # - job: gromacs:clang-9-mpi:configure gromacs:gcc-8-cuda-10.1:release:build: extends: @@ -498,19 +496,19 @@ gromacs:gcc-7:release:build: needs: - job: gromacs:gcc-7:release:configure -gromacs:clang-9:release:build: - extends: - - .variables:default - - .gromacs:base:build - - .before_script:default - - .use-ccache - - .rules:nightly-only-for-release - stage: release-build - variables: - BUILD_DIR: release-builds-clang - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master - needs: - - job: gromacs:clang-9:release:configure + #gromacs:clang-9:release:build: + # extends: + # - .variables:default + # - .gromacs:base:build + # - .before_script:default + # - .use-ccache + # - .rules:nightly-only-for-release + # stage: release-build + # variables: + # BUILD_DIR: release-builds-clang + # image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + # needs: + # - job: gromacs:clang-9:release:configure gromacs:clang-8-cuda-10.1:release:build: extends: @@ -601,7 +599,6 @@ gromacs:gcc-7:test: KUBERNETES_EXTENDED_RESOURCE_NAME: "amd.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 tags: - - k8s-scilifelab needs: - job: gromacs:gcc-7:build @@ -614,7 +611,6 @@ gromacs:gcc-8-cuda-10.1:test: KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu" KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 tags: - - k8s-scilifelab needs: - job: gromacs:gcc-8-cuda-10.1:build @@ -634,28 +630,26 @@ gromacs:clang-TSAN:test: needs: - job: gromacs:clang-TSAN:build -gromacs:clang-ASAN:test: - extends: - - .gromacs:base:test - - .use-clang:base - - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master - variables: - CTEST_RUN_MODE: "ExperimentalMemCheck" - tags: - - k8s-scilifelab - needs: - - job: gromacs:clang-ASAN:build - -gromacs:clang-9-mpi:test: - extends: - - .gromacs:base:test - - .rules:merge-requests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master - tags: - - k8s-scilifelab - needs: - - job: gromacs:clang-9-mpi:build + #gromacs:clang-ASAN:test: + # extends: + # - .gromacs:base:test + # - .use-clang:base + # - .rules:merge-requests + # image: gromacs/cmake-3.13.0-llvm-8-tsan:master + # variables: + # CTEST_RUN_MODE: "ExperimentalMemCheck" + # tags: + # needs: + # - job: gromacs:clang-ASAN:build + + #gromacs:clang-9-mpi:test: + # extends: + # - .gromacs:base:test + # - .rules:merge-requests + # image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + # tags: + # needs: + # - job: gromacs:clang-9-mpi:build gromacs:gcc-7:regressiontest: extends: @@ -669,7 +663,6 @@ gromacs:gcc-7:regressiontest: REGRESSIONTEST_TOTAL_RANK_NUMBER: 2 REGRESSIONTEST_OMP_RANK_NUMBER: 1 tags: - - k8s-scilifelab needs: - job: gromacs:gcc-7:build - job: regressiontests:prepare @@ -686,7 +679,6 @@ gromacs:gcc-8-cuda-10.1:regressiontest: REGRESSIONTEST_TOTAL_RANK_NUMBER: 2 REGRESSIONTEST_OMP_RANK_NUMBER: 1 tags: - - k8s-scilifelab needs: - job: gromacs:gcc-8-cuda-10.1:build - job: regressiontests:prepare @@ -697,7 +689,6 @@ gromacs:clang-8:regressiontest: - .rules:merge-requests image: gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020 tags: - - k8s-scilifelab needs: - job: gromacs:clang-8:build - job: regressiontests:prepare @@ -708,36 +699,33 @@ gromacs:clang-TSAN:regressiontest: - .rules:merge-requests image: gromacs/cmake-3.13.0-llvm-8-tsan:master tags: - - k8s-scilifelab needs: - job: gromacs:clang-TSAN:build - job: regressiontests:prepare -gromacs:clang-ASAN:regressiontest: - extends: - - .gromacs:base:regressiontest - - .use-clang:base - - .rules:merge-requests - image: gromacs/cmake-3.13.0-llvm-8-tsan:master - tags: - - k8s-scilifelab - needs: - - job: gromacs:clang-ASAN:build - - job: regressiontests:prepare - -gromacs:clang-9:regressiontest: - extends: - - .gromacs:base:regressiontest - - .rules:merge-requests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master - variables: - REGRESSIONTEST_DOUBLE: "-double" - REGRESSIONTEST_PARALLEL: "-np" - tags: - - k8s-scilifelab - needs: - - job: gromacs:clang-9-mpi:build - - job: regressiontests:prepare + #gromacs:clang-ASAN:regressiontest: + # extends: + # - .gromacs:base:regressiontest + # - .use-clang:base + # - .rules:merge-requests + # image: gromacs/cmake-3.13.0-llvm-8-tsan:master + # tags: + # needs: + # - job: gromacs:clang-ASAN:build + # - job: regressiontests:prepare + + #gromacs:clang-9:regressiontest: + # extends: + # - .gromacs:base:regressiontest + # - .rules:merge-requests + # image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + # variables: + # REGRESSIONTEST_DOUBLE: "-double" + # REGRESSIONTEST_PARALLEL: "-np" + # tags: + # needs: + # - job: gromacs:clang-9-mpi:build + # - job: regressiontests:prepare gromacs:gcc-8-cuda-10.1:release:test: extends: @@ -750,7 +738,6 @@ gromacs:gcc-8-cuda-10.1:release:test: KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 BUILD_DIR: release-builds-gcc tags: - - k8s-scilifelab needs: - job: gromacs:gcc-8-cuda-10.1:release:configure - job: gromacs:gcc-8-cuda-10.1:release:build @@ -767,17 +754,17 @@ gromacs:gcc-7:release:test: - job: gromacs:gcc-7:release:configure - job: gromacs:gcc-7:release:build -gromacs:clang-9:release:test: - extends: - - .gromacs:base:test - - .rules:nightly-only-for-release - stage: release-tests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master - variables: - BUILD_DIR: release-builds-clang - needs: - - job: gromacs:clang-9:release:configure - - job: gromacs:clang-9:release:build + #gromacs:clang-9:release:test: + # extends: + # - .gromacs:base:test + # - .rules:nightly-only-for-release + # stage: release-tests + # image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + # variables: + # BUILD_DIR: release-builds-clang + # needs: + # - job: gromacs:clang-9:release:configure + # - job: gromacs:clang-9:release:build gromacs:clang-8-cuda-10.1:release:test: extends: @@ -790,7 +777,6 @@ gromacs:clang-8-cuda-10.1:release:test: KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1 BUILD_DIR: release-builds-clang tags: - - k8s-scilifelab needs: - job: gromacs:clang-8-cuda-10.1:release:configure - job: gromacs:clang-8-cuda-10.1:release:build @@ -804,26 +790,24 @@ gromacs:gcc-7:release:regressiontest: variables: BUILD_DIR: release-builds-gcc tags: - - k8s-scilifelab needs: - job: gromacs:gcc-7:release:build - job: regressiontests:package -gromacs:clang-9:release:regressiontest: - extends: - - .gromacs:base:regressiontest - - .rules:nightly-only-for-release - stage: release-tests - image: gromacs/cmake-3.15.7-llvm-9-openmpi:master - variables: - BUILD_DIR: release-builds-clang - REGRESSIONTEST_DOUBLE: "-double" - REGRESSIONTEST_PARALLEL: "-np" - tags: - - k8s-scilifelab - needs: - - job: gromacs:clang-9:release:build - - job: regressiontests:package + #gromacs:clang-9:release:regressiontest: + # extends: + # - .gromacs:base:regressiontest + # - .rules:nightly-only-for-release + # stage: release-tests + # image: gromacs/cmake-3.15.7-llvm-9-openmpi:master + # variables: + # BUILD_DIR: release-builds-clang + # REGRESSIONTEST_DOUBLE: "-double" + # REGRESSIONTEST_PARALLEL: "-np" + # tags: + # needs: + # - job: gromacs:clang-9:release:build + # - job: regressiontests:package gromacs:clang-8-cuda-10.1:release:regressiontest: extends: @@ -839,7 +823,6 @@ gromacs:clang-8-cuda-10.1:release:regressiontest: REGRESSIONTEST_TOTAL_RANK_NUMBER: 2 REGRESSIONTEST_OMP_RANK_NUMBER: 1 tags: - - k8s-scilifelab needs: - job: gromacs:clang-8-cuda-10.1:release:build - job: regressiontests:package diff --git a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml index 682a951e58..aab384b61c 100644 --- a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml +++ b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml @@ -35,7 +35,6 @@ when: always expire_in: 1 week tags: - - k8s-scilifelab # The dependency means we need to use the same tag restriction as upstream. needs: - job: gromacs:clang-8:build @@ -98,7 +97,6 @@ gmxapi-0.1:clang-8:py-3.8.2: when: always expire_in: 1 week tags: - - k8s-scilifelab # The dependency means we need to use the same tag restriction as upstream. needs: - job: gromacs:clang-8:build diff --git a/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml b/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml index 7fd4fc9b2a..b79b161a24 100644 --- a/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml +++ b/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml @@ -25,7 +25,6 @@ when: always expire_in: 1 week tags: - - k8s-scilifelab # The dependency means we need to use the same tag restriction as upstream. needs: # Note: if we want to run regression tests using artifacts from the `release-2020` diff --git a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml index 1c99c8fb97..6e9c3a5f0f 100644 --- a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml +++ b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml @@ -20,7 +20,6 @@ when: always expire_in: 1 week tags: - - k8s-scilifelab # The dependency means we need to use the same tag restriction as upstream. needs: - job: gromacs:clang-8:build