From ff38dc4c164e15da82794397b91171059ee8d38f Mon Sep 17 00:00:00 2001
From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Fri, 20 Mar 2020 08:03:11 +0100
Subject: [PATCH] Fix release builds on Gitlab with regressiontests

Change-Id: Id6465d545d350b8c0d89aecd37d3568dca510d8b
---
 .gitlab-ci.yml                                  | 8 ++++++++
 admin/ci-templates/.build-template.yml          | 3 ++-
 admin/ci-templates/.regressiontest-template.yml | 3 ---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 100d9933ac..7cd2043d22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1348,6 +1348,7 @@ test-gcc-7-release:
         artifacts: true
       - job: build-gcc-7-release
         artifacts: true
+      - job: prepare-regressiontests
     only:
       refs:
         - triggers
@@ -1369,6 +1370,7 @@ test-gcc-7-gmxapi-release:
         artifacts: true
       - job: build-gcc-7-gmxapi-release
         artifacts: true
+      - job: prepare-regressiontests
     only:
       refs:
         - triggers
@@ -1384,11 +1386,13 @@ test-gcc-7-double-release:
     stage: release-tests
     variables:
         BUILD_DIR: release-builds-gcc
+        REGRESSIONTEST_DOUBLE: "-double"
     needs:
       - job: configure-gcc-7-double-release
         artifacts: true
       - job: build-gcc-7-double-release
         artifacts: true
+      - job: prepare-regressiontests
     only:
       refs:
         - triggers
@@ -1409,6 +1413,7 @@ test-gcc-8-release:
         artifacts: true
       - job: build-gcc-8-release
         artifacts: true
+      - job: prepare-regressiontests
     only:
       refs:
         - triggers
@@ -1429,6 +1434,7 @@ test-clang-7-release:
         artifacts: true
       - job: build-clang-7-release
         artifacts: true
+      - job: prepare-regressiontests
     only:
       refs:
         - triggers
@@ -1450,6 +1456,7 @@ test-clang-7-gmxapi-release:
         artifacts: true
       - job: build-clang-7-gmxapi-release
         artifacts: true
+      - job: prepare-regressiontests
     only:
       refs:
         - triggers
@@ -1470,6 +1477,7 @@ test-clang-8-release:
         artifacts: true
       - job: build-clang-8-release
         artifacts: true
+      - job: prepare-regressiontests
     only:
       refs:
         - triggers
diff --git a/admin/ci-templates/.build-template.yml b/admin/ci-templates/.build-template.yml
index d05a83dce6..1045801237 100644
--- a/admin/ci-templates/.build-template.yml
+++ b/admin/ci-templates/.build-template.yml
@@ -107,7 +107,8 @@
     - mv $SOURCENAME ../$RELEASE_SOURCE
     - tar -xf $REGTESTTARBALL
     - mv $REGTESTNAME ../$RELEASE_REGRESSIONTESTS
-    - rm $SOURCETARBALL $REGTESTTARBALL
+    - rm $SOURCETARBALL
+    - cp $REGTESTTARBALL gmx-regressiontests.tar.gz
     - cd ..
     - echo $CMAKE_COMPILER_SCRIPT
     - echo $CMAKE_EXTRA_OPTIONS
diff --git a/admin/ci-templates/.regressiontest-template.yml b/admin/ci-templates/.regressiontest-template.yml
index ad9c052e34..6641f9fa37 100644
--- a/admin/ci-templates/.regressiontest-template.yml
+++ b/admin/ci-templates/.regressiontest-template.yml
@@ -13,9 +13,6 @@
       - pushes
       - merge_requests
       - schedules
-  except:
-    variables:
-      - $GROMACS_RELEASE
 # Always clone the default version for this branch, release-2020 in this case
   script:
     - export REGTESTBRANCH=release-2020
-- 
2.11.4.GIT