Use the correct CI script for sample_restraint jobs.

release-2021 should use the CI script that applies
the pytest `--threads` option.

diff --git a/admin/ci-scripts/build-and-test-py-gmxapi-0.2.sh b/admin/ci-scripts/build-and-test-py-gmxapi-0.2.sh
index 828538828bd245a78a4ba4ab9fcaa1c48986179a..e33fb3faaa8ace41e9f44b0bda7e04d2cde1fedb 100644 (file)
--- a/admin/ci-scripts/build-and-test-py-gmxapi-0.2.sh
+++ b/admin/ci-scripts/build-and-test-py-gmxapi-0.2.sh
@@ -61,7 +61,7 @@ if [ -x `which mpiexec` ]; then
 fi
 
 # Run Python acceptance tests.
-python -m pytest python_packaging/test --junitxml=$PY_ACCEPTANCE_TEST_XML
+python -m pytest python_packaging/test --junitxml=$PY_ACCEPTANCE_TEST_XML --threads=2
 
 # Note: Multiple pytest processes getting --junitxml output file argument
 # may cause problems, so we set the option on only one of the launched processes.

diff --git a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
index b20cf11b149a1264e06f865a670bff7cd33c01c8..a52a4ad1dd57a2c4fbf34bfaee797af90f4bdb87 100644 (file)
--- a/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
+++ b/admin/gitlab-ci/sample_restraint.gitlab-ci.yml
@@ -15,7 +15,7 @@
     EXTRA_INSTALLS: "curl libbz2-dev libffi-dev liblzma-dev libncurses5-dev libncursesw5-dev libreadline-dev libsqlite3-dev libssl-dev llvm python-openssl tk-dev zlib1g-dev"
   script:
     - source $INSTALL_DIR/bin/GMXRC
-    - source $VENVPATH/bin/activate && INSTALL_DIR=$PWD/$INSTALL_DIR OMP_NUM_THREADS=1 bash admin/ci-scripts/build-and-test-sample_restraint-2020.sh
+    - source $VENVPATH/bin/activate && INSTALL_DIR=$PWD/$INSTALL_DIR OMP_NUM_THREADS=1 bash admin/ci-scripts/build-and-test-sample_restraint-2021.sh
   artifacts:
     reports:
       junit: