From 79514dc68cec2ac016f6359ffd8aaa8b80c3551c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Sun, 24 Jan 2021 17:03:28 +0100 Subject: [PATCH 1/6] Dockerfile for ppc64le client --- ...kerfile.EESSI-client-pilot-centos7-ppc64le | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 containers/Dockerfile.EESSI-client-pilot-centos7-ppc64le diff --git a/containers/Dockerfile.EESSI-client-pilot-centos7-ppc64le b/containers/Dockerfile.EESSI-client-pilot-centos7-ppc64le new file mode 100644 index 00000000..b8cca650 --- /dev/null +++ b/containers/Dockerfile.EESSI-client-pilot-centos7-ppc64le @@ -0,0 +1,27 @@ +FROM docker.io/ppc64le/centos:7 + +RUN yum install -y sudo vim openssh-clients cmake wget make unzip patch valgrind bzip2 + +RUN yum install -y gcc gcc-c++ sqlite-devel python-devel libcap-devel libuuid-devel attr \ + && yum install -y fuse-devel fuse3-devel zlib-devel openssl-devel + +# build CernVM-FS from source (no aarch64 Debian packages available) +RUN wget https://github.com/cvmfs/cvmfs/archive/cvmfs-2.7.5.tar.gz && \ + tar xfz cvmfs-2.7.5.tar.gz && \ + cd cvmfs*2.7.5/ && \ + mkdir build && \ + cd build && \ + cmake .. -DBUILD_SERVER=no -DBUILD_SERVER_DEBUG=no -DDBUILD_SHRINKWRAP=no && \ + make -j $(nproc) && \ + sudo make install && \ + cd / && \ + rm -r cvmfs*2.7.5* + +RUN yum install -y https://github.com/EESSI/filesystem-layer/releases/download/v0.2.3/cvmfs-config-eessi-0.2.3-1.noarch.rpm + +RUN echo 'CVMFS_QUOTA_LIMIT=10000' > /etc/cvmfs/default.local \ + && echo 'CVMFS_HTTP_PROXY="DIRECT"' >> /etc/cvmfs/default.local + +RUN mkdir -p /cvmfs/{cvmfs-config.eessi-hpc.org,pilot.eessi-hpc.org} + +RUN useradd -ms /bin/bash eessi From dfdea1fc17eb396c628441a9e874cca818572697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 3 Feb 2021 15:25:42 +0100 Subject: [PATCH 2/6] use variables for cvmfs version and config package --- .../Dockerfile.EESSI-client-pilot-centos7-ppc64le | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/containers/Dockerfile.EESSI-client-pilot-centos7-ppc64le b/containers/Dockerfile.EESSI-client-pilot-centos7-ppc64le index b8cca650..91ca03d2 100644 --- a/containers/Dockerfile.EESSI-client-pilot-centos7-ppc64le +++ b/containers/Dockerfile.EESSI-client-pilot-centos7-ppc64le @@ -1,4 +1,6 @@ FROM docker.io/ppc64le/centos:7 +ARG cvmfsversion=2.8.0 +ARG cvmfsconfig=https://github.com/EESSI/filesystem-layer/releases/download/v0.2.3/cvmfs-config-eessi-0.2.3-1.noarch.rpm RUN yum install -y sudo vim openssh-clients cmake wget make unzip patch valgrind bzip2 @@ -6,18 +8,20 @@ RUN yum install -y gcc gcc-c++ sqlite-devel python-devel libcap-devel libuuid-de && yum install -y fuse-devel fuse3-devel zlib-devel openssl-devel # build CernVM-FS from source (no aarch64 Debian packages available) -RUN wget https://github.com/cvmfs/cvmfs/archive/cvmfs-2.7.5.tar.gz && \ - tar xfz cvmfs-2.7.5.tar.gz && \ - cd cvmfs*2.7.5/ && \ +RUN wget https://github.com/cvmfs/cvmfs/archive/cvmfs-${cvmfsversion}.tar.gz && \ + tar xfz cvmfs-${cvmfsversion}.tar.gz && \ + cd cvmfs*${cvmfsversion}/ && \ mkdir build && \ cd build && \ cmake .. -DBUILD_SERVER=no -DBUILD_SERVER_DEBUG=no -DDBUILD_SHRINKWRAP=no && \ make -j $(nproc) && \ sudo make install && \ cd / && \ - rm -r cvmfs*2.7.5* + rm -r cvmfs*${cvmfsversion}* -RUN yum install -y https://github.com/EESSI/filesystem-layer/releases/download/v0.2.3/cvmfs-config-eessi-0.2.3-1.noarch.rpm +RUN yum install -y ${cvmfsconfig} + +RUN yum remove -y fuse && yum install -y fuse3 RUN echo 'CVMFS_QUOTA_LIMIT=10000' > /etc/cvmfs/default.local \ && echo 'CVMFS_HTTP_PROXY="DIRECT"' >> /etc/cvmfs/default.local From d68e9055d9f9d34d05846f7cb706a983528476b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 12 Feb 2021 09:38:14 +0100 Subject: [PATCH 3/6] version bump for cvmfs and epel roles --- requirements.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.yml b/requirements.yml index ad1addb2..c4c7dfa5 100644 --- a/requirements.yml +++ b/requirements.yml @@ -4,7 +4,7 @@ roles: - name: galaxyproject.cvmfs - version: 0.2.13 + version: 0.2.14 - name: geerlingguy.repo-epel - version: 1.3.0 + version: 3.0.0 From 0b6384b336dffc3c741de6e754496a2c787260a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 18 Feb 2021 16:29:10 +0100 Subject: [PATCH 4/6] change master to main --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1e56a64d..abbefa1e 100644 --- a/README.md +++ b/README.md @@ -231,7 +231,7 @@ It might take a few minutes, but then the new file should show up at the clients ## Building the CVMFS configuration packages -For each push and pull request to the master branch, packages are automatically built by a Github Action. +For each push and pull request to the `main` branch, packages are automatically built by a Github Action. The resulting (unversioned) packages can be found as build artifacts on the page of each run of this action. When a new tag is created to mark a versioned release of the repository (e.g. `v1.2.3`, where the `v` is required!), the action builds a package with the same version number, creates a release, and stores the packages @@ -242,6 +242,6 @@ as release assets. The software in this repository is distributed under the terms of the [GNU General Public License v2.0](https://opensource.org/licenses/GPL-2.0). -See [LICENSE](https://github.com/EESSI/filesystem-layer/blob/master/LICENSE) for more information. +See [LICENSE](https://github.com/EESSI/filesystem-layer/blob/main/LICENSE) for more information. SPDX-License-Identifier: GPL-2.0-only From c447318a5d736b1932ce4f7b48fed56adb485622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 18 Feb 2021 16:30:20 +0100 Subject: [PATCH 5/6] change master to main --- .github/workflows/build-test-release-client-packages.yml | 4 ++-- .github/workflows/test-playbooks.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-release-client-packages.yml b/.github/workflows/build-test-release-client-packages.yml index 946e8c16..cfe08fd9 100644 --- a/.github/workflows/build-test-release-client-packages.yml +++ b/.github/workflows/build-test-release-client-packages.yml @@ -3,13 +3,13 @@ name: Build, test, and release client packages on: push: branches: - - master + - main - test_client_packages_ci tags: - 'v*' pull_request: branches: - - master + - main - test_client_packages_ci jobs: diff --git a/.github/workflows/test-playbooks.yml b/.github/workflows/test-playbooks.yml index ba01c59f..3d29f0a9 100644 --- a/.github/workflows/test-playbooks.yml +++ b/.github/workflows/test-playbooks.yml @@ -3,14 +3,14 @@ name: Test Ansible Playbooks on: push: branches: - - master + - main paths-ignore: - "**.md" - "**.example" - "containers/**" pull_request: branches: - - master + - main paths-ignore: - "**.md" - "**.example" From ff7397c1e6ab010f1729a302aaa566b608e0c8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 19 Feb 2021 08:59:32 +0100 Subject: [PATCH 6/6] set auto tag timespan to 30 days --- inventory/group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index b8c74e72..af3b62e4 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -69,8 +69,8 @@ eessi_cvmfs_repositories: key_dir: /etc/cvmfs/keys/eessi-hpc.org server_options: - CVMFS_AUTO_GC=false + - CVMFS_AUTO_TAG_TIMESPAN="30 days ago" - CVMFS_GARBAGE_COLLECTION=true - - CVMFS_AUTO_GC=false client_options: - CVMFS_NFILES=4096