From 8bb76094cfe522c71546c99e19f4dc8beb12ab92 Mon Sep 17 00:00:00 2001 From: Paul Bauer Date: Fri, 20 Mar 2020 08:03:11 +0100 Subject: [PATCH] Fix release builds on Gitlab with regressiontests Change-Id: Id6465d545d350b8c0d89aecd37d3568dca510d8b --- admin/gitlab-ci/archive.gitlab-ci.yml | 4 +++- admin/gitlab-ci/gromacs.gitlab-ci.yml | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/admin/gitlab-ci/archive.gitlab-ci.yml b/admin/gitlab-ci/archive.gitlab-ci.yml index b2096f00fb..9e2be222aa 100644 --- a/admin/gitlab-ci/archive.gitlab-ci.yml +++ b/admin/gitlab-ci/archive.gitlab-ci.yml @@ -98,12 +98,14 @@ regressiontests:package: - git clean -ffdxq - git gc - git archive -o $REGTESTNAME.tar.gz --prefix $REGTESTNAME/ -9 HEAD - - mv $REGTESTNAME.tar.gz .. + - cp $REGTESTNAME.tar.gz gmx-regressiontests.tar.gz + - mv $REGTESTNAME.tar.gz gmx-regressiontests.tar.gz .. - echo "Build regressiontests for branch $REGTESTBRANCH" - cd .. artifacts: paths: - regressiontests-*.tar.gz + - gmx-regressiontests.tar.gz archive:configure:nightly: extends: diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml index 7a083a3170..c3b61ab1f7 100644 --- a/admin/gitlab-ci/gromacs.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml @@ -631,6 +631,7 @@ gromacs:gcc-7:release:test: artifacts: true - job: gromacs:gcc-7:release:build artifacts: true + - job: regressiontests:package gromacs:gcc-7-simd-sse41:test: extends: @@ -669,6 +670,7 @@ gromacs:gcc-7-double:release:test: artifacts: true - job: gromacs:gcc-7-double:release:build artifacts: true + - job: regressiontests:package gromacs:gcc-8:test: extends: @@ -694,6 +696,7 @@ gromacs:gcc-8:release:test: artifacts: true - job: gromacs:gcc-8:release:build artifacts: true + - job: regressiontests:package gromacs:gcc-8-cuda-10.2:test: extends: @@ -752,6 +755,7 @@ gromacs:clang-7:release:test: artifacts: true - job: gromacs:clang-7:release:build artifacts: true + - job: regressiontests:package gromacs:clang-8:test: extends: @@ -777,3 +781,4 @@ gromacs:clang-8:release:test: artifacts: true - job: gromacs:clang-8:release:build artifacts: true + - job: regressiontests:package -- 2.22.0