diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 455d3d9ab..2db00cded 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ - .docker_image .opensuse: &opensuse - image: "kitware/vtkm:ci-opensuse-20230619" + image: "kitware/vtkm:ci-opensuse-20231117" extends: - .docker_image diff --git a/.gitlab/ci/docker/opensuse/Dockerfile b/.gitlab/ci/docker/opensuse/Dockerfile index 9143683dc..56601fc9d 100644 --- a/.gitlab/ci/docker/opensuse/Dockerfile +++ b/.gitlab/ci/docker/opensuse/Dockerfile @@ -24,13 +24,17 @@ RUN zypper refresh && \ git-lfs \ hdf5-devel \ libgomp1 \ - mpich \ - mpich-devel \ + libucp-devel \ + mpich-ofi \ + mpich-ofi-devel \ ninja \ + openucx-tools \ python311 \ python311-scipy \ tbb-devel && \ zypper clean --all +ENV fI_PROVIDER=sockets + # Need to run git-lfs install manually on system packaged version RUN git-lfs install diff --git a/vtkm/filter/flow/testing/CMakeLists.txt b/vtkm/filter/flow/testing/CMakeLists.txt index b8bbaa7d2..1f2562c06 100644 --- a/vtkm/filter/flow/testing/CMakeLists.txt +++ b/vtkm/filter/flow/testing/CMakeLists.txt @@ -56,4 +56,5 @@ if (VTKm_ENABLE_MPI) SOURCES ${mpi_unit_tests} ${mpi_helpers} USE_VTKM_JOB_POOL ) + set_tests_properties(UnitTestAdvectionAsynchronousMPI_mpi PROPERTIES TIMEOUT 500) endif()