Skip to content

Commit

Permalink
Merge pull request #10 from pwalczysko/Rocky9
Browse files Browse the repository at this point in the history
Make work on Rocky Linux 9
  • Loading branch information
jburel authored Jan 15, 2024
2 parents 188d66a + b2c18ad commit 66c98fa
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:

list-scenarios:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
outputs:
matrix: ${{ steps.listscenarios.outputs.scenarios }}
steps:
Expand All @@ -22,7 +22,7 @@ jobs:
name: Test
needs:
- list-scenarios
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
# Keep running so we can see if other tests pass
fail-fast: false
Expand All @@ -48,7 +48,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags')
needs:
- test
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: galaxy
uses: robertdebock/galaxy-action@1.2.1
Expand Down
4 changes: 2 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ galaxy_info:
platforms:
- name: EL
versions:
- 7
- 9
- name: Ubuntu
versions:
- xenial
- jammy
namespace: ome
galaxy_tags: []

Expand Down
14 changes: 0 additions & 14 deletions molecule/default/Dockerfile.j2

This file was deleted.

19 changes: 19 additions & 0 deletions molecule/default/destroy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- name: Destroy molecule containers

Check warning on line 1 in molecule/default/destroy.yml

View workflow job for this annotation

GitHub Actions / Test (default)

1:1 [document-start] missing document start "---"
hosts: molecule
gather_facts: false
tasks:
- name: Stop and remove container
delegate_to: localhost
community.docker.docker_container:
name: "{{ inventory_hostname }}"
state: absent
auto_remove: true

- name: Remove dynamic molecule inventory
hosts: localhost
gather_facts: false
tasks:
- name: Remove dynamic inventory file
ansible.builtin.file:
path: "{{ molecule_ephemeral_directory }}/inventory/molecule_inventory.yml"

Check failure on line 18 in molecule/default/destroy.yml

View workflow job for this annotation

GitHub Actions / Test (default)

18:81 [line-length] line too long (83 > 80 characters)
state: absent
7 changes: 6 additions & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ lint: |
flake8
platforms:
- name: nfs-mount
image: centos/systemd
image: eniocarboni/docker-rockylinux-systemd:9
image_version: latest
command: /sbin/init
privileged: true
cgroupns_mode: host
tmpfs:
- /sys/fs/cgroup
groups:
- extra_options
volumes:
# This allows NFS exports to work on Docker
- "nfs-share-rw:/srv"
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
- host: "*"
options: "rw,fsid=0"

- role: ansible-role-nfs-mount
- role: ome.nfs_mount
nfs_share_mounts:
- path: /mnt/rw
location: localhost:/share
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
- src: ome.nfs_share
- name: ome.nfs_share
6 changes: 4 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@

- name: Install NFS mount utility
become: true
yum:
ansible.builtin.dnf:
update_cache: true
name: nfs-utils
state: present
when: ansible_os_family == "RedHat"

- name: Install NFS mount utility
become: true
apt:
ansible.builtin.apt:
update_cache: true
pkg: nfs-common
state: present
when: ansible_os_family == "Debian"
Expand Down

0 comments on commit 66c98fa

Please sign in to comment.