mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Update docker images to use cmake 3.17.3
The 3.17.3 release fixes a regression in ctest where NOT_RUN tests didn't get reported to ctest or cdash
This commit is contained in:
parent
0f7a509cdb
commit
e7ca8be0b9
@ -44,37 +44,37 @@
|
|||||||
GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
|
GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
|
||||||
|
|
||||||
.centos7: ¢os7
|
.centos7: ¢os7
|
||||||
image: "kitware/vtkm:ci-centos7_cuda10.2-20200410"
|
image: "kitware/vtkm:ci-centos7_cuda10.2-20200529"
|
||||||
extends:
|
extends:
|
||||||
- .docker_image
|
- .docker_image
|
||||||
|
|
||||||
.centos8: ¢os8
|
.centos8: ¢os8
|
||||||
image: "kitware/vtkm:ci-centos8-20200410"
|
image: "kitware/vtkm:ci-centos8-20200529"
|
||||||
extends:
|
extends:
|
||||||
- .docker_image
|
- .docker_image
|
||||||
|
|
||||||
.rhel8: &rhel8
|
.rhel8: &rhel8
|
||||||
image: "kitware/vtkm:ci-rhel8_cuda10.2-20200410"
|
image: "kitware/vtkm:ci-rhel8_cuda10.2-20200529"
|
||||||
extends:
|
extends:
|
||||||
- .docker_image
|
- .docker_image
|
||||||
|
|
||||||
.ubuntu1604: &ubuntu1604
|
.ubuntu1604: &ubuntu1604
|
||||||
image: "kitware/vtkm:ci-ubuntu1604-20200410"
|
image: "kitware/vtkm:ci-ubuntu1604-20200529"
|
||||||
extends:
|
extends:
|
||||||
- .docker_image
|
- .docker_image
|
||||||
|
|
||||||
.ubuntu1604_cuda: &ubuntu1604_cuda
|
.ubuntu1604_cuda: &ubuntu1604_cuda
|
||||||
image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200410"
|
image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200529"
|
||||||
extends:
|
extends:
|
||||||
- .docker_image
|
- .docker_image
|
||||||
|
|
||||||
.ubuntu1804: &ubuntu1804
|
.ubuntu1804: &ubuntu1804
|
||||||
image: "kitware/vtkm:ci-ubuntu1804-20200410"
|
image: "kitware/vtkm:ci-ubuntu1804-20200529"
|
||||||
extends:
|
extends:
|
||||||
- .docker_image
|
- .docker_image
|
||||||
|
|
||||||
.ubuntu1804_cuda: &ubuntu1804_cuda
|
.ubuntu1804_cuda: &ubuntu1804_cuda
|
||||||
image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200410"
|
image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200529"
|
||||||
extends:
|
extends:
|
||||||
- .docker_image
|
- .docker_image
|
||||||
|
|
||||||
|
@ -9,13 +9,15 @@ RUN yum install git git-lfs -y
|
|||||||
# Install CMake 3.13 as it is the minium for cuda builds
|
# Install CMake 3.13 as it is the minium for cuda builds
|
||||||
RUN mkdir /opt/cmake && \
|
RUN mkdir /opt/cmake && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.13.5/cmake-3.13.5-Linux-x86_64.sh > cmake-3.13.5-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.13.5/cmake-3.13.5-Linux-x86_64.sh > cmake-3.13.5-Linux-x86_64.sh && \
|
||||||
sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
|
sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.13.5-Linux-x86_64.sh
|
||||||
|
|
||||||
# Provide CMake 3.17 so we can re-run tests easily
|
# Provide CMake 3.17 so we can re-run tests easily
|
||||||
# This will be used when we run just the tests
|
# This will be used when we run just the tests
|
||||||
RUN mkdir /opt/cmake-latest/ && \
|
RUN mkdir /opt/cmake-latest/ && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-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 PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
|
||||||
|
@ -7,12 +7,10 @@ RUN yum install git git-lfs -y
|
|||||||
|
|
||||||
# Provide CMake 3.17 so we can re-run tests easily
|
# Provide CMake 3.17 so we can re-run tests easily
|
||||||
# This will be used when we run just the tests
|
# This will be used when we run just the tests
|
||||||
RUN mkdir /opt/cmake-latest/ && \
|
RUN mkdir /opt/cmake/ && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||||
ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
|
rm cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
|
ln -s /opt/cmake/bin/ctest /opt/cmake/bin/ctest-latest
|
||||||
|
|
||||||
# Provide a consistent CMake path across all images. Just use the lastest cmake
|
ENV PATH "/opt/cmake/bin:${PATH}"
|
||||||
RUN mkdir -p /opt/cmake/bin && ln -s /opt/cmake-latest/bin/cmake /opt/cmake/bin/cmake
|
|
||||||
|
|
||||||
ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
|
|
||||||
|
@ -7,12 +7,10 @@ RUN yum install git git-lfs -y
|
|||||||
|
|
||||||
# Provide CMake 3.17 so we can re-run tests easily
|
# Provide CMake 3.17 so we can re-run tests easily
|
||||||
# This will be used when we run just the tests
|
# This will be used when we run just the tests
|
||||||
RUN mkdir /opt/cmake-latest/ && \
|
RUN mkdir /opt/cmake/ && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||||
ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
|
rm cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
|
ln -s /opt/cmake/bin/ctest /opt/cmake/bin/ctest-latest
|
||||||
|
|
||||||
# Provide a consistent CMake path across all images. Just use the lastest cmake
|
ENV PATH "/opt/cmake/bin:${PATH}"
|
||||||
RUN mkdir -p /opt/cmake/bin && ln -s /opt/cmake-latest/bin/cmake /opt/cmake/bin/cmake
|
|
||||||
|
|
||||||
ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
|
|
||||||
|
@ -39,13 +39,15 @@ RUN mkdir /opt/openmpi && \
|
|||||||
# Install CMake 3.12 as it is the minium for non-cuda builds
|
# Install CMake 3.12 as it is the minium for non-cuda builds
|
||||||
RUN mkdir /opt/cmake && \
|
RUN mkdir /opt/cmake && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.sh > cmake-3.12.4-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.sh > cmake-3.12.4-Linux-x86_64.sh && \
|
||||||
sh cmake-3.12.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
|
sh cmake-3.12.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.12.4-Linux-x86_64.sh
|
||||||
|
|
||||||
# Provide CMake 3.17 so we can re-run tests easily
|
# Provide CMake 3.17 so we can re-run tests easily
|
||||||
# This will be used when we run just the tests
|
# This will be used when we run just the tests
|
||||||
RUN mkdir /opt/cmake-latest/ && \
|
RUN mkdir /opt/cmake-latest/ && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-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 PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
|
||||||
|
@ -37,13 +37,15 @@ RUN mkdir /opt/openmpi && \
|
|||||||
# Install CMake 3.13 as it is the minium for cuda builds
|
# Install CMake 3.13 as it is the minium for cuda builds
|
||||||
RUN mkdir /opt/cmake && \
|
RUN mkdir /opt/cmake && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.13.5/cmake-3.13.5-Linux-x86_64.sh > cmake-3.13.5-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.13.5/cmake-3.13.5-Linux-x86_64.sh > cmake-3.13.5-Linux-x86_64.sh && \
|
||||||
sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
|
sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.13.5-Linux-x86_64.sh
|
||||||
|
|
||||||
# Provide CMake 3.17 so we can re-run tests easily
|
# Provide CMake 3.17 so we can re-run tests easily
|
||||||
# This will be used when we run just the tests
|
# This will be used when we run just the tests
|
||||||
RUN mkdir /opt/cmake-latest/ && \
|
RUN mkdir /opt/cmake-latest/ && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-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 PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
|
||||||
|
@ -31,14 +31,16 @@ RUN git-lfs install
|
|||||||
# Provide a consistent CMake path across all images
|
# Provide a consistent CMake path across all images
|
||||||
# Allow tests that require CMake to work correctly
|
# Allow tests that require CMake to work correctly
|
||||||
RUN mkdir /opt/cmake && \
|
RUN mkdir /opt/cmake && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.sh > cmake-3.16.4-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.16.7/cmake-3.16.7-Linux-x86_64.sh > cmake-3.16.7-Linux-x86_64.sh && \
|
||||||
sh cmake-3.16.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
|
sh cmake-3.16.7-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.16.7-Linux-x86_64.sh
|
||||||
|
|
||||||
# Provide CMake 3.17 so we can re-run tests easily
|
# Provide CMake 3.17 so we can re-run tests easily
|
||||||
# This will be used when we run just the tests
|
# This will be used when we run just the tests
|
||||||
RUN mkdir /opt/cmake-latest/ && \
|
RUN mkdir /opt/cmake-latest/ && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-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 PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
|
||||||
|
@ -22,14 +22,16 @@ RUN git-lfs install
|
|||||||
# Provide a consistent CMake path across all images
|
# Provide a consistent CMake path across all images
|
||||||
# Allow tests that require CMake to work correctly
|
# Allow tests that require CMake to work correctly
|
||||||
RUN mkdir /opt/cmake && \
|
RUN mkdir /opt/cmake && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.sh > cmake-3.16.4-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.16.7/cmake-3.16.7-Linux-x86_64.sh > cmake-3.16.7-Linux-x86_64.sh && \
|
||||||
sh cmake-3.16.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
|
sh cmake-3.16.7-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.16.7-Linux-x86_64.sh
|
||||||
|
|
||||||
# Provide CMake 3.17 so we can re-run tests easily
|
# Provide CMake 3.17 so we can re-run tests easily
|
||||||
# This will be used when we run just the tests
|
# This will be used when we run just the tests
|
||||||
RUN mkdir /opt/cmake-latest/ && \
|
RUN mkdir /opt/cmake-latest/ && \
|
||||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
|
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
|
||||||
|
rm cmake-3.17.3-Linux-x86_64.sh && \
|
||||||
ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-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 PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
|
||||||
|
Loading…
Reference in New Issue
Block a user