Skip to content

Commit

Permalink
Merge pull request #3 from kevincoakley/2.1.0
Browse files Browse the repository at this point in the history
2.1.0
  • Loading branch information
kevincoakley authored May 15, 2020
2 parents a761c4c + 219c41c commit 1c37b10
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 25 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/molecule-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Molecule Test
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
max-parallel: 4
matrix:
molecule_distro: ['centos7', 'centos8', 'ubuntu1804', 'ubuntu2004']
env:
ANSIBLE_CALLBACK_WHITELIST: profile_tasks

steps:
- uses: actions/checkout@v1
- name: Set up Python 3
uses: actions/setup-python@v1
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install ansible-lint flake8 molecule docker
- name: Test with molecule
run: |
molecule test --all
env:
MOLECULE_DISTRO: ${{ matrix.molecule_distro }}
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ are not present in the list of Ansible facts, like the container's private ip ad
Requirements
------------

None. Tested on CentOS 7 and Ubuntu 18.04.
None. Tested on CentOS 7 & 8 and Ubuntu 18.04 & 20.04.

Role Variables
--------------
Expand Down
3 changes: 3 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
galaxy_info:
role_name: facter
author: Kevin Coakley
description: Install Facter on a host then regather the host facts

Expand All @@ -25,9 +26,11 @@ galaxy_info:
- name: EL
versions:
- 7
- 8
- name: Ubuntu
versions:
- bionic
- focal

galaxy_tags:
- system
Expand Down
9 changes: 5 additions & 4 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ dependency:
name: galaxy
driver:
name: docker
lint:
name: yamllint
options:
config-file: molecule/default/yaml-lint.yml
lint: |
set -e
yamllint -c molecule/yaml-lint.yml .
ansible-lint
flake8
platforms:
- name: instance
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
state: present
when: ansible_os_family == "RedHat"

- name: Run "apt-get update" (Debian)
apt:
update_cache: true
when: ansible_os_family == "Debian"

- name: Download and install Ruby (Debian)
package:
name: ruby
Expand Down

0 comments on commit 1c37b10

Please sign in to comment.