biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dd72ea4)
Use updated CI pipeline rules for Python package tests.
authorM. Eric Irrgang <ericirrgang@gmail.com>
Tue, 20 Oct 2020 16:44:35 +0000 (18:44 +0200)
committerPaul Bauer <paul.bauer.q@gmail.com>
Thu, 22 Oct 2020 16:26:14 +0000 (16:26 +0000)
Refs #3744

admin/gitlab-ci/python-gmxapi.gitlab-ci.yml patch | blob | history
admin/gitlab-ci/sample_restraint.gitlab-ci.yml patch | blob | history

diff --git a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
index 5715a736a136f11022ee2e128c2f7e720ded8e28..b67387838b075788360c8d404486d922cad24990 100644 (file)
--- 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 25d2fc6734400123abe52aac913dfcbc5a7a8af6..56833f77ea4eb3f4964e190cb92548f5ac1a714b 100644 (file)
--- 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"
Local GROMACS mirror with custom stuff