diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a29659..2cab1e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} diff --git a/meta/main.yml b/meta/main.yml index b15b917..e960c3c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -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 diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index d23ad4d..73a4808 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -4,14 +4,9 @@ hosts: all become: true - pre_tasks: - - name: Update apt cache. - apt: update_cache=yes cache_valid_time=600 - when: ansible_os_family == 'Debian' - roles: - role: cvmfs_contrib.cvmfs_client vars: cvmfs_client_configure_storage: false - cvmfs_cache_size: "1000" # small cache size for CI + cvmfs_cache_size: "1500" # small cache size for CI cvmfs_http_proxy: "DIRECT" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index cc1d989..a46b538 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -8,7 +8,7 @@ driver: name: docker platforms: - name: instance - image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest" + image: "geerlingguy/docker-rockylinux8-ansible:latest" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro @@ -18,3 +18,5 @@ provisioner: name: ansible playbooks: converge: converge.yml + options: + diff: True diff --git a/tasks/packages.yml b/tasks/packages.yml index 9167689..16e130a 100644 --- a/tasks/packages.yml +++ b/tasks/packages.yml @@ -2,7 +2,29 @@ - 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 [] }}" + register: yum + +- name: Print yum stdout + debug: + var: yum.stdout_lines +- name: Print yum stderr + debug: + var: yum.stderr_lines + +- name: TEST install cvmfs-auto-setup + yum: + name: cvmfs-auto-setup + state: present + + +- debug: + msg: "cvmfs_configuration is {{ cvmfs_configuration }}" + +- name: TEST install cvmfs_configuration + yum: + name: "{{ cvmfs_configuration }}" + state: present