Merge pull request #169 from manics/OMERO-test-integration

OMERO-test-integration pin pytest-xdist<2
ome · Aug 19, 2020 · 2c31e94 · 2c31e94
2 parents 7a7c6ba + f57666c
commit 2c31e94
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/home/jobs/OMERO-test-integration/config.xml b/home/jobs/OMERO-test-integration/config.xml
@@ -14,15 +14,16 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>if [ ! -e $WORKSPACE/.venv3 ]; then
-    virtualenv $WORKSPACE/.venv3
-fi
+      <command>rm -rf $WORKSPACE/.venv3
+python -m venv $WORKSPACE/.venv3
 
 source $WORKSPACE/.venv3/bin/activate
 pip install https://github.com/ome/zeroc-ice-py-centos7/releases/download/0.2.1/zeroc_ice-3.6.5-cp36-cp36m-linux_x86_64.whl
 pip install -U pip future setuptools
 pip install markdown
-pip install mox3 pytest pytest-django pytest-xdist
+# Avoid installing psutil for now
+# https://github.com/pytest-dev/pytest-xdist/issues/585
+pip install mox3 pytest pytest-django &apos;pytest-xdist&lt;2&apos;
 pip install tables
 pip install jinja2
 pip install PyYAML
@@ -144,6 +145,8 @@ omero admin diagnostics
 # RUN TESTS
 export OMERO_SESSION_DIR=/tmp/$JOB_NAME/$BUILD_NUMBER
 export ICE_CONFIG=$SRC/dist/etc/ice.config
+#export PYTEST_ADDOPTS=&quot;-n16&quot;
+
 echo Running the integration tests with -Dtestng.useDefaultListeners=true
 
 $SRC/build.py -f components/tools/OmeroJava/build.xml -Dtestng.useDefaultListeners=true -Dtestreports.dir=target/reports/integration integration
@@ -182,4 +185,4 @@ deactivate
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.9"/>
   </buildWrappers>
-</project>
+</project>
diff --git a/home/jobs/OMERO-training/config.xml b/home/jobs/OMERO-training/config.xml
@@ -14,15 +14,16 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>if [ ! -e $WORKSPACE/.venv3 ]; then
-    virtualenv $WORKSPACE/.venv3
-fi
+      <command>rm -rf $WORKSPACE/.venv3
+python -m venv $WORKSPACE/.venv3
 
 source $WORKSPACE/.venv3/bin/activate
 pip install https://github.com/ome/zeroc-ice-py-centos7/releases/download/0.2.1/zeroc_ice-3.6.5-cp36-cp36m-linux_x86_64.whl
 pip install -U pip future setuptools
 pip install markdown
-pip install mox3 pytest pytest-xdist
+# Avoid installing psutil for now
+# https://github.com/pytest-dev/pytest-xdist/issues/585
+pip install mox3 pytest &apos;pytest-xdist&lt;2&apos;
 pip install tables
 pip install jinja2
 
@@ -101,4 +102,4 @@ java -cp .:$OMERODIR/lib/client/* training/Setup</command>
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.9"/>
   </buildWrappers>
-</project>
+</project>