From: Paul Bauer Date: Mon, 7 Jun 2021 13:20:54 +0000 (+0200) Subject: Revert "Temporarily lift requirement to detect GPUs in CI" X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=3a78d26fe27ef5f3ea5617c83071a4f218c67d2c;p=alexxy%2Fgromacs.git Revert "Temporarily lift requirement to detect GPUs in CI" This reverts commit b5f89c1771eda9912d94672bae31e611da9b4107. Not needed after CI fix. --- diff --git a/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml index e073c5f02b..4a7e1aeb56 100644 --- a/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml @@ -196,8 +196,8 @@ # If $GMX_TEST_REQUIRED_NUMBER_OF_DEVICES is not set and we have GPUs, set it - if [ -z $GMX_TEST_REQUIRED_NUMBER_OF_DEVICES ] && [ -n $KUBERNETES_EXTENDED_RESOURCE_NAME ] ; then if grep -q '/gpu$' <<< "$KUBERNETES_EXTENDED_RESOURCE_NAME"; then - echo "export GMX_TEST_REQUIRED_NUMBER_OF_DEVICES=\"0\""; - export GMX_TEST_REQUIRED_NUMBER_OF_DEVICES=0; + echo "export GMX_TEST_REQUIRED_NUMBER_OF_DEVICES=\"$KUBERNETES_EXTENDED_RESOURCE_LIMIT\""; + export GMX_TEST_REQUIRED_NUMBER_OF_DEVICES="$KUBERNETES_EXTENDED_RESOURCE_LIMIT"; fi fi - if grep -qF 'nvidia.com/gpu' <<< "$KUBERNETES_EXTENDED_RESOURCE_NAME"; then