Skip to content

ci: remove docker vfs workaround #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,9 @@ jobs:
with:
path: ${{ env.galaxy-name }}

- name: Set up Python 3.8
uses: actions/setup-python@v2
- uses: gofrolist/molecule-action@v2
with:
python-version: 3.8

- name: Upgrade pip
run: |
pip install --upgrade pip wheel
pip --version

- name: Install requirements
run: |
pip install -r requirements.txt
working-directory: ${{ env.galaxy-name }}

# See https://github.com/geerlingguy/raspberry-pi-dramble/issues/166
- name: Force GitHub Actions' docker daemon to use vfs.
run: |
sudo systemctl stop docker
echo '{"cgroup-parent":"/actions_job","storage-driver":"vfs"}' | sudo tee /etc/docker/daemon.json
sudo systemctl start docker

- name: Run molecule
run: molecule test
working-directory: ${{ env.galaxy-name }}
molecule_working_dir: ${{ env.galaxy-name }}
env:
MOLECULE_DISTRO: ${{ matrix.distro }}

Expand Down
2 changes: 2 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
galaxy_info:
role_name: cvmfs_client
namespace: compute_canada
author: Compute Canada CVMFS Team
description: CVMFS client role
company: Compute Canada
Expand Down
2 changes: 1 addition & 1 deletion tasks/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

- name: Install CVMFS client and configuration packages
yum:
name: "['cvmfs'] + {{ cvmfs_auto_setup_package }} + {{ cvmfs_fuse3_package }} + {{ cvmfs_configuration }}"
name: "{{ ['cvmfs'] + cvmfs_auto_setup_package + cvmfs_fuse3_package + cvmfs_configuration }}"
vars:
cvmfs_auto_setup_package: "{{ ['cvmfs-auto-setup'] if cvmfs_auto_setup|bool else [] }}"
cvmfs_fuse3_package: "{{ ['cvmfs-fuse3'] if cvmfs_use_fuse3|bool else [] }}"