CI: Try again with durin plugin and VDS/integrated format

.gitea/workflows/build_and_test.yml

@@ -174,9 +174,26 @@ jobs:
         shell: bash
         run: |
           cd tests/xds_durin
+          rm -rf *.h5 *.LP *.HKL
           ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -f10
           /opt/xds/xds_par
           test -f IDXREF.LP
+      - name: Run XDS with Durin and VDS HDF5 format
+        shell: bash
+        run: |
+          cd tests/xds_durin
+          rm -rf *.h5 *.LP *.HKL
+          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -f10 -V
+          /opt/xds/xds_par
+          test -f IDXREF.LP
+      - name: Run XDS with Durin and integrated HDF5 format
+        shell: bash
+        run: |
+          cd tests/xds_durin
+          rm -rf *.h5 *.LP *.HKL
+          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -S
+          /opt/xds/xds_par
+          test -f IDXREF.LP
   xds-test:
     name: XDS test (JFJoch plugin)
     runs-on: jfjoch_rocky9

docker/rocky9/Dockerfile

@@ -205,12 +205,7 @@ RUN set -eux; \
         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
+        cp -a /tmp/XDS-gfortran_Linux_x86_64/. /opt/xds/
 
 RUN set -eux; \
     cd /tmp; \
@@ -225,18 +220,7 @@ RUN set -eux; \
 
 RUN dnf -y install python3-Cython python3-pip python3-devel && dnf clean all
 
-RUN set -eux; \
-    cd /tmp; \
-    git clone --depth 1 https://github.com/kiyo-masui/bitshuffle.git; \
-    cd bitshuffle; \
-    mkdir -p bitshuffle/plugin; \
-    python3 setup.py build_ext --inplace; \
-    python3 setup.py install; \
-    mkdir -p /usr/local/hdf5/lib/plugin; \
-    plugin_so="$(find build -type f -name 'libh5bshuf*.so' | head -n 1)"; \
-    test -n "$plugin_so"; \
-    cp -av "$plugin_so" /usr/local/hdf5/lib/plugin/; \
-    rm -rf /tmp/bitshuffle
+COPY durin-plugin.so /opt/xds/durin-plugin.so
 
 # Make Qt and Eigen discoverable by CMake
 ENV CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/opt/hdf5-${HDF5_TAG}-static:/opt/qt-${QT_VERSION}-static