From e57a5e4f798c4daebcb7af70f89420665c3e5a77 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 30 Mar 2026 14:43:23 +0200 Subject: [PATCH] CI: Add XDS test --- .gitea/workflows/build_and_test.yml | 11 +++++++++-- docker/rocky9/Dockerfile | 12 ++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build_and_test.yml b/.gitea/workflows/build_and_test.yml index a2b13f9a..a61648b1 100644 --- a/.gitea/workflows/build_and_test.yml +++ b/.gitea/workflows/build_and_test.yml @@ -122,8 +122,8 @@ jobs: python3 gitea_upload_file.py "$file" done fi - dials-test: - name: DIALS processing test + processing-test: + name: Data processing test runs-on: jfjoch_rocky9 steps: - uses: actions/checkout@v4 @@ -158,6 +158,13 @@ jobs: cd test03 ../build/tools/jfjoch_hdf5_test ../tests/test_data/compression_benchmark.h5 -n100 -S -o single xia2.ssx image=single.h5 space_group=P43212 unit_cell=78.551,78.551,36.914,90.000,90.000,90.000 + - name: Run XDS with Durin and VDS format + shell: bash + run: | + cd tests/xds_durin + ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -f10 -V + xds_par + test -f IDXREF.LP python-client: name: Generate python client runs-on: jfjoch_rocky8 diff --git a/docker/rocky9/Dockerfile b/docker/rocky9/Dockerfile index f0f3734c..ea0ec9bf 100644 --- a/docker/rocky9/Dockerfile +++ b/docker/rocky9/Dockerfile @@ -200,6 +200,18 @@ RUN set -eux; \ cd /; \ rm -rf /tmp/dials.tar.xz /tmp/dials-*-linux-x86_64 + RUN set -eux; \ + mkdir -p /opt/xds; \ + cd /tmp; \ + curl -fL -o XDS-gfortran_Linux_x86_64.tar.gz https://xds.mr.mpg.de/XDS-gfortran_Linux_x86_64.tar.gz; \ + tar -xzf XDS-gfortran_Linux_x86_64.tar.gz; \ + cp -a /tmp/XDS-gfortran_Linux_x86_64/. /opt/xds/; \ + curl -fL -o durin-plugin-rhel7-x86.zip https://github.com/DiamondLightSource/durin/releases/download/v2023-10/durin-plugin-rhel7-x86.zip; \ + unzip durin-plugin-rhel7-x86.zip; \ + mv durin-plugin.so /opt/xds/durin-plugin.so; \ + chmod 755 /opt/xds/durin-plugin.so; \ + rm -rf /tmp/XDS-gfortran_Linux_x86_64 /tmp/XDS-gfortran_Linux_x86_64.tar.gz /tmp/durin-plugin-rhel7-x86.zip + # Make Qt and Eigen discoverable by CMake ENV CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/opt/hdf5-${HDF5_TAG}-static:/opt/qt-${QT_VERSION}-static