Skip to content

Commit 2584d80

Browse files
authored
Merge pull request #25 from Oefenweb/make-use-of-github
Make use of github actions
2 parents 2dde9f8 + 7f7f9ad commit 2584d80

File tree

20 files changed

+239
-182
lines changed

20 files changed

+239
-182
lines changed

.ansible-lint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
warn_list:
2+
- '106'
3+
- '204'

.github/workflows/ci.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
---
2+
name: CI
3+
'on':
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
schedule:
9+
- cron: '30 1 * * 3'
10+
11+
jobs:
12+
13+
lint:
14+
name: Lint
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Check out the codebase
18+
uses: actions/checkout@v2
19+
20+
- name: Set up Python 3
21+
uses: actions/setup-python@v2
22+
with:
23+
python-version: '3.x'
24+
25+
- name: Install test dependencies
26+
run: pip install ansible-lint[community,yamllint]
27+
28+
- name: Lint code
29+
run: |
30+
yamllint .
31+
ansible-lint
32+
33+
molecule:
34+
name: Molecule
35+
runs-on: ubuntu-latest
36+
defaults:
37+
run:
38+
working-directory: "${{ github.repository }}"
39+
needs:
40+
- lint
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
include:
45+
- distro: debian8
46+
- distro: debian9
47+
- distro: debian10
48+
- distro: ubuntu1604
49+
ansible-version: '>=2.8, <2.9'
50+
- distro: ubuntu1604
51+
ansible-version: '>=2.9, <2.10'
52+
- distro: ubuntu1604
53+
ansible-version: '>=2.10, <2.11'
54+
- distro: ubuntu1604
55+
- distro: ubuntu1804
56+
- distro: ubuntu2004
57+
58+
steps:
59+
- name: Check out the codebase
60+
uses: actions/checkout@v2
61+
with:
62+
path: "${{ github.repository }}"
63+
64+
- name: Set up Python 3
65+
uses: actions/setup-python@v2
66+
with:
67+
python-version: '3.x'
68+
69+
- name: Install test dependencies
70+
run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
71+
72+
- name: Run Molecule tests
73+
run: |
74+
molecule test
75+
env:
76+
ANSIBLE_FORCE_COLOR: '1'
77+
ANSIBLE_VERBOSITY: '3'
78+
MOLECULE_DEBUG: '1'
79+
MOLECULE_DISTRO: "${{ matrix.distro }}"
80+
PY_COLORS: '1'

.github/workflows/release.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Release
3+
'on':
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
10+
release:
11+
name: Release
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check out the codebase
15+
uses: actions/checkout@v2
16+
17+
- name: Publish to Galaxy
18+
uses: robertdebock/galaxy-action@1.1.0
19+
with:
20+
galaxy_api_key: ${{ secrets.GALAXY_API_KEY }}

.travis.yml

Lines changed: 0 additions & 99 deletions
This file was deleted.

.yamllint

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
extends: default
3+
4+
rules:
5+
braces:
6+
max-spaces-inside: 1
7+
level: error
8+
brackets:
9+
max-spaces-inside: 1
10+
level: error
11+
line-length: disable
12+
truthy: disable
13+
14+
ignore: |
15+
.tox/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ RUN rm -rf $HOME/.cache
1717
# provision
1818
COPY . /etc/ansible/roles/ansible-role
1919
WORKDIR /etc/ansible/roles/ansible-role
20-
RUN ansible-playbook -i tests/inventory tests/test.yml --connection=local -vv
20+
RUN ansible-playbook -i tests/inventory tests/test.yml --connection=local

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## ssh-keys
22

3-
[![Build Status](https://travis-ci.org/Oefenweb/ansible-ssh-keys.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-ssh-keys)
3+
[![CI](https://github.com/Oefenweb/ansible-ssh-keys/workflows/CI/badge.svg)](https://github.com/Oefenweb/ansible-ssh-keys/actions?query=workflow%3ACI)
44
[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-ssh--keys-blue.svg)](https://galaxy.ansible.com/Oefenweb/ssh_keys)
55

66
Manage ssh public key authentication (public / private / authorized keys and known hosts) in Debian-like systems.
@@ -83,8 +83,6 @@ None
8383
fingerprint: 'AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
8484
```
8585
86-
The `fingerprint` and `enctype` can be obtained using `ssh-keyscan`: `ssh-keyscan github.com` or the handy `ssh-keyscan` wrapper included in this role.
87-
8886
#### License
8987
9088
MIT

Vagrantfile

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,26 @@
44
role = File.basename(File.expand_path(File.dirname(__FILE__)))
55

66
boxes = [
7-
{
8-
:name => "ubuntu-1204",
9-
:box => "bento/ubuntu-12.04",
10-
:ip => '10.0.0.11',
11-
:cpu => "50",
12-
:ram => "256"
13-
},
14-
{
15-
:name => "ubuntu-1404",
16-
:box => "bento/ubuntu-14.04",
17-
:ip => '10.0.0.12',
18-
:cpu => "50",
19-
:ram => "256"
20-
},
217
{
228
:name => "ubuntu-1604",
239
:box => "bento/ubuntu-16.04",
24-
:ip => '10.0.0.13',
10+
:ip => '10.0.0.12',
2511
:cpu => "50",
2612
:ram => "256"
2713
},
2814
{
2915
:name => "ubuntu-1804",
3016
:box => "bento/ubuntu-18.04",
31-
:ip => '10.0.0.14',
17+
:ip => '10.0.0.13',
3218
:cpu => "50",
3319
:ram => "384"
3420
},
3521
{
36-
:name => "debian-7",
37-
:box => "bento/debian-7",
38-
:ip => '10.0.0.15',
22+
:name => "ubuntu-2004",
23+
:box => "bento/ubuntu-20.04",
24+
:ip => '10.0.0.14',
3925
:cpu => "50",
40-
:ram => "256"
26+
:ram => "384"
4127
},
4228
{
4329
:name => "debian-8",

meta/main.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
galaxy_info:
44
namespace: oefenweb
5-
role_name: ssh-keys
5+
role_name: ssh_keys
66
author: Mischa ter Smitten
77
company: Oefenweb.nl B.V.
88
description: Manage ssh public key authentication (public / private / authorized keys and known hosts) in Debian-like systems
@@ -11,17 +11,15 @@ galaxy_info:
1111
platforms:
1212
- name: Ubuntu
1313
versions:
14-
- precise
15-
- trusty
1614
- xenial
1715
- bionic
16+
- focal
1817
- name: Debian
1918
versions:
20-
- wheezy
2119
- jessie
2220
- stretch
2321
- buster
2422
galaxy_tags:
25-
- system
26-
- networking
23+
- system
24+
- networking
2725
dependencies: []

molecule/default/converge.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
- name: Converge
3+
hosts: all
4+
become: true
5+
tasks: []
6+
roles:
7+
- ../../../

0 commit comments

Comments
 (0)