diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7810bece6..aa569bd24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,37 +44,37 @@ GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci .centos7: ¢os7 - image: "kitware/vtkm:ci-centos7_cuda10.2-20200529" + image: "kitware/vtkm:ci-centos7_cuda10.2-20200601" extends: - .docker_image .centos8: ¢os8 - image: "kitware/vtkm:ci-centos8-20200529" + image: "kitware/vtkm:ci-centos8-20200601" extends: - .docker_image .rhel8: &rhel8 - image: "kitware/vtkm:ci-rhel8_cuda10.2-20200529" + image: "kitware/vtkm:ci-rhel8_cuda10.2-20200601" extends: - .docker_image .ubuntu1604: &ubuntu1604 - image: "kitware/vtkm:ci-ubuntu1604-20200529" + image: "kitware/vtkm:ci-ubuntu1604-20200601" extends: - .docker_image .ubuntu1604_cuda: &ubuntu1604_cuda - image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200529" + image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200601" extends: - .docker_image .ubuntu1804: &ubuntu1804 - image: "kitware/vtkm:ci-ubuntu1804-20200529" + image: "kitware/vtkm:ci-ubuntu1804-20200601" extends: - .docker_image .ubuntu1804_cuda: &ubuntu1804_cuda - image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200529" + image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200601" extends: - .docker_image diff --git a/.gitlab/ci/docker/ubuntu1604/base/Dockerfile b/.gitlab/ci/docker/ubuntu1604/base/Dockerfile index 2fdd54c3f..3a010ecf6 100644 --- a/.gitlab/ci/docker/ubuntu1604/base/Dockerfile +++ b/.gitlab/ci/docker/ubuntu1604/base/Dockerfile @@ -51,3 +51,4 @@ RUN mkdir /opt/cmake-latest/ && \ ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}" +ENV LD_LIBRARY_PATH "/opt/openmpi/lib:${LD_LIBRARY_PATH}" diff --git a/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile b/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile index 48f70b895..f403ae016 100644 --- a/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile +++ b/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile @@ -49,3 +49,4 @@ RUN mkdir /opt/cmake-latest/ && \ ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}" +ENV LD_LIBRARY_PATH "/opt/openmpi/lib:${LD_LIBRARY_PATH}"