Update CI on 2020 branch

[alexxy/gromacs.git] / admin / gitlab-ci / python-gmxapi.gitlab-ci.yml

diff --git a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
index 477dff8ae8f47930bd5857d6191204d888831066..3e7a0666d102746dca267d89f648ec6fd28bc96c 100644 (file)
--- a/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
+++ b/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
@@ -12,7 +12,7 @@
   variables:
     KUBERNETES_CPU_LIMIT: 2
     KUBERNETES_CPU_REQUEST: 2
-    KUBERNETES_MEMORY_LIMIT: 2Gi
+    KUBERNETES_MEMORY_REQUEST: 2Gi
     PY_UNIT_TEST_XML: $CI_PROJECT_DIR/py-JUnitTestResults.xml
     PY_MPI_UNIT_TEST_XML: $CI_PROJECT_DIR/py-mpi-JUnitTestResults.xml
     PY_ACCEPTANCE_TEST_XML: $CI_PROJECT_DIR/gmxapi-acceptance-JUnitTestResults.xml
@@ -30,6 +30,9 @@
         - $PY_MPI_ACCEPTANCE_TEST_XML
     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
       artifacts: true
@@ -90,6 +93,9 @@ gmxapi-0.1:clang-8:py-3.8.2:
         - $PY_MPI_ACCEPTANCE_TEST_XML
     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
       artifacts: true