From: M. Eric Irrgang <ericirrgang@gmail.com>
Date: Tue, 20 Oct 2020 16:44:35 +0000 (+0200)
Subject: Use updated CI pipeline rules for Python package tests.
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=bf1f0c994d214cfbb268db099c2cc43c5d1032d5;p=alexxy%2Fgromacs.git

Use updated CI pipeline rules for Python package tests.

Refs #3744
---

diff --git a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
index 5715a736a1..b67387838b 100644
--- a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
+++ b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
@@ -111,7 +111,7 @@ gmxapi-0.1:clang-8:py-3.8.2:
 gmxapi-0.2:gcc-7:gmx2021:py-3.6.10:
   extends:
     - .gmxapi-0.2:gcc-7:gmx2021
-    - .rules:merge-requests:master
+    - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.6"
     PY_VER: "3.6.10"
@@ -119,7 +119,7 @@ gmxapi-0.2:gcc-7:gmx2021:py-3.6.10:
 gmxapi-0.2:gcc-7:gmx2021:py-3.7.7:
   extends:
     - .gmxapi-0.2:gcc-7:gmx2021
-    - .rules:merge-requests:master
+    - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.7"
     PY_VER: "3.7.7"
@@ -127,7 +127,7 @@ gmxapi-0.2:gcc-7:gmx2021:py-3.7.7:
 gmxapi-0.2:gcc-7:gmx2021:py-3.8.2:
   extends:
     - .gmxapi-0.2:gcc-7:gmx2021
-    - .rules:merge-requests:master
+    - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.8"
     PY_VER: "3.8.2"
diff --git a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
index 25d2fc6734..56833f77ea 100644
--- a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
+++ b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
@@ -33,7 +33,7 @@
 sample_restraint:gcc-7:gmx2021:py-3.6.10:
   extends:
     - .sample_restraint:gcc-7:gmx2021
-    - .rules:merge-requests:master
+    - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.6"
     PY_VER: "3.6.10"
@@ -41,7 +41,7 @@ sample_restraint:gcc-7:gmx2021:py-3.6.10:
 sample_restraint:gcc-7:gmx2021:py-3.7.7:
   extends:
     - .sample_restraint:gcc-7:gmx2021
-    - .rules:merge-requests:master
+    - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.7"
     PY_VER: "3.7.7"
@@ -49,7 +49,7 @@ sample_restraint:gcc-7:gmx2021:py-3.7.7:
 sample_restraint:gcc-7:gmx2021:py-3.8.2:
   extends:
     - .sample_restraint:gcc-7:gmx2021
-    - .rules:merge-requests:master
+    - .rules:merge-requests:release-2021
   variables:
     VENVPATH: "/root/venv/py3.8"
     PY_VER: "3.8.2"