diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff12f11..1bf0ee8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -195,11 +195,6 @@ spack_debian10: before_script: - . ./CI/utility_docker_functions.bash Release gcc.cmake $(pwd) $HOST_CACHES_PATH spack-debian10 spack-debian10 -spack_centos7: - extends: .scheduled_spack_package - before_script: - - . ./CI/utility_docker_functions.bash Release gcc.cmake $(pwd) $HOST_CACHES_PATH spack-centos7 spack-centos7 - spack_fedora34: extends: .scheduled_spack_package before_script: diff --git a/CHANGELOG.md b/CHANGELOG.md index 032a9e2..17a7991 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [Unreleased] + +### Removed + +- Removed the CI test with Spack on CentOS 7 + + ## [1.7.0] ### Added diff --git a/CI/Dockerfile.spack-centos7 b/CI/Dockerfile.spack-centos7 deleted file mode 100644 index 46b121f..0000000 --- a/CI/Dockerfile.spack-centos7 +++ /dev/null @@ -1,28 +0,0 @@ -FROM spack/centos7:latest - -# Install gcc 8.3.1 through devtoolset-8 -# glibc-static is required for building the SSH hook's custom OpenSSH software -RUN yum install -y centos-release-scl-rh \ - && yum install -y devtoolset-8-gcc-c++ \ - glibc-static which \ - && rm -rf /var/cache/yum \ - && yum clean all - -# Enable devtoolset-8 to set gcc 8.3.1 as default compiler -RUN source /opt/rh/devtoolset-8/enable \ - && spack compiler find - -# Install builtin dependencies for Sarus -RUN spack install wget -RUN spack install cmake -RUN spack install boost@1.65.0: cxxstd=11 +program_options +regex +filesystem -RUN spack install skopeo -RUN spack install umoci -RUN spack install runc@:1.0.3 -RUN spack install tini -RUN spack install squashfs -RUN spack install python@3: - -ENTRYPOINT [] -CMD [] -