Skip to content

Commit b024519

Browse files
Merge pull request #17 from MonolithProjects/develop
Support for Fedora 32 and Ubuntu 20 Former-commit-id: 8408b67
2 parents 257132d + d0000a1 commit b024519

File tree

6 files changed

+59
-26
lines changed

6 files changed

+59
-26
lines changed

.github/workflows/galaxy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ jobs:
1313
- name: galaxy
1414
uses: robertdebock/[email protected]
1515
with:
16-
galaxy_api_key: ${{ secrets.galaxy_api_key }}
16+
galaxy_api_key: ${{ secrets.galaxy_api_key }}
17+

.github/workflows/main.yml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,7 @@ jobs:
1717
uses: actions/checkout@v2
1818
with:
1919
path: "${{ github.repository }}"
20-
- name: molecule
21-
uses: robertdebock/molecule-action@2.0.0
20+
- name: Molecule for Ansible
21+
uses: MonolithProjects/action-molecule@v1.0.1
2222
env:
23-
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
24-
# uninstall:
25-
# needs:
26-
# - test
27-
# runs-on: ubuntu-latest
28-
# strategy:
29-
# fail-fast: false
30-
# steps:
31-
# - name: checkout
32-
# uses: actions/checkout@v2
33-
# with:
34-
# path: "${{ github.repository }}"
35-
# - name: molecule
36-
# uses: robertdebock/[email protected]
37-
# with:
38-
# entrypoint: /usr/local/bin/molecule
39-
# optionst: "converge -- --tags uninstall"
40-
# env:
41-
# PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
23+
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ This role will deploy or redeploy or uninstall and register or unregister local
1313
* Supported Linux distros:
1414
* CentOS/RHEL 7,8
1515
* Debian 9,10
16-
* Fedora 31,30,29,28
17-
* Ubuntu 16,18
16+
* Fedora 32,31,30,29,28
17+
* Ubuntu 16,18,20
18+
19+
**Note:** Fedora 32 and Ubuntu 20 must use Ansible 2.9.8+. Other distros/releases will work also with older 2.8.0+ Ansible.
1820

1921
* System must have access to the GitHub.
2022

@@ -26,7 +28,7 @@ Personal Access Token for GitHub account can be created [here](https://github.co
2628
* Runner user has to be pre-created.
2729
Recommended role: `monolithprojects.user_management`
2830

29-
* CentOS/Fedora systems require EPEL repository.
31+
* CentOS systems require EPEL repository.
3032
Recommended role: `robertdebock.epel`
3133

3234
## Role Variables

meta/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@
55
description: Deploy Github Actions private runner
66
company: MonolithProjects
77
license: "license (MIT)"
8-
min_ansible_version: 2.8
8+
min_ansible_version: 2.9.8
99
platforms:
1010
- name: EL
1111
versions:
1212
- 6
1313
- 7
14+
- 8
1415
- name: Fedora
1516
versions:
1617
- 28
1718
- 29
1819
- 30
1920
- 31
21+
- 32
2022
- name: Debian
2123
versions:
2224
- buster
@@ -25,6 +27,7 @@
2527
versions:
2628
- xenial
2729
- bionic
30+
- focal
2831
galaxy_tags:
2932
- github
3033
- actions

molecule/default/molecule.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
driver:
33
name: docker
44
lint: |
5+
set -e
56
yamllint .
7+
ansible-lint
68
platforms:
79
- name: CentOS7
810
image: monolithprojects/systemd-centos7:latest
@@ -34,6 +36,16 @@ platforms:
3436
- /sys/fs/cgroup:/sys/fs/cgroup:ro
3537
privileged: yes
3638
pre_build_image: yes
39+
- name: Fedora32
40+
image: monolithprojects/systemd-fedora32:latest
41+
command: /sbin/init
42+
tmpfs:
43+
- /run
44+
- /tmp
45+
volumes:
46+
- /sys/fs/cgroup:/sys/fs/cgroup:ro
47+
privileged: yes
48+
pre_build_image: yes
3749
- name: Ubuntu16
3850
image: monolithprojects/systemd-ubuntu16:latest
3951
command: /sbin/init
@@ -54,6 +66,16 @@ platforms:
5466
- /sys/fs/cgroup:/sys/fs/cgroup:ro
5567
privileged: yes
5668
pre_build_image: yes
69+
- name: Ubuntu20
70+
image: monolithprojects/systemd-ubuntu20:latest
71+
command: /sbin/init
72+
tmpfs:
73+
- /run
74+
- /tmp
75+
volumes:
76+
- /sys/fs/cgroup:/sys/fs/cgroup:ro
77+
privileged: yes
78+
pre_build_image: yes
5779
- name: Debian9
5880
image: monolithprojects/systemd-debian9:latest
5981
command: /sbin/init
@@ -83,6 +105,14 @@ provisioner:
83105
inventory:
84106
host_vars:
85107
CentOS8:
108+
ansible_python_interpreter: /usr/bin/python3
109+
Debian9:
110+
ansible_python_interpreter: /usr/bin/python3
111+
Debian10:
112+
ansible_python_interpreter: /usr/bin/python3
113+
Ubuntu18:
114+
ansible_python_interpreter: /usr/bin/python3
115+
Ubuntu20:
86116
ansible_python_interpreter: /usr/bin/python3
87117
verifier:
88118
name: ansible

tasks/install_deps.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,21 @@
5555
tags:
5656
- install
5757

58+
- name: Install dependencies on Ubuntu Focal systems
59+
package:
60+
pkg:
61+
- liblttng-ust0
62+
- libkrb5-3
63+
- zlib1g
64+
- libssl1.1
65+
- libicu66
66+
state: present
67+
update_cache: yes
68+
when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "20")
69+
tags:
70+
- install
71+
72+
5873
- name: Install dependencies on RHEL/CentOS/Fedora systems
5974
package:
6075
name:

0 commit comments

Comments
 (0)