Skip to content
This repository was archived by the owner on Mar 9, 2024. It is now read-only.

Commit 7d4d114

Browse files
cloudalchemybotpaulfantom
authored andcommitted
[REPO SYNC] add support for CentOS8 (#14)
* 🤖 sync with cloudalchemy/skeleton (SHA: 8cf4d397): add support for CentOS8 * vars: add support for new OSes from redhat family
1 parent eb75909 commit 7d4d114

File tree

6 files changed

+30
-8
lines changed

6 files changed

+30
-8
lines changed

.travis/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
set -euo pipefail
44

5-
if [ ! -d "./molecule/latest" ]; then
6-
tox
5+
if [ ! -d "./molecule/latest" ]; then
6+
tox -- molecule test --all
77
exit 0
88
fi
99

1010
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
11-
tox -- molecule test --all --destroy never
11+
tox -- molecule test --all --destroy always
1212
else
1313
tox -- molecule test -s default --destroy always
1414
if [ -d "./molecule/alternative" ]; then

meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ galaxy_info:
1818
- name: EL
1919
versions:
2020
- 7
21+
- 8
2122
- name: Fedora
2223
versions:
2324
- 30

molecule/default/molecule.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ platforms:
2424
privileged: true
2525
volumes:
2626
- /sys/fs/cgroup:/sys/fs/cgroup:ro
27-
- name: jessie
28-
image: paulfantom/debian-molecule:8
27+
- name: buster
28+
image: paulfantom/debian-molecule:10
2929
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
3030
privileged: true
3131
volumes:
@@ -36,12 +36,22 @@ platforms:
3636
privileged: true
3737
volumes:
3838
- /sys/fs/cgroup:/sys/fs/cgroup:ro
39+
- name: centos8
40+
image: paulfantom/centos-molecule:8
41+
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
42+
privileged: true
43+
volumes:
44+
- /sys/fs/cgroup:/sys/fs/cgroup:ro
45+
groups:
46+
- python3
3947
- name: fedora
40-
image: paulfantom/fedora-molecule:27
48+
image: paulfantom/fedora-molecule:30
4149
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
4250
privileged: true
4351
volumes:
4452
- /sys/fs/cgroup:/sys/fs/cgroup:ro
53+
groups:
54+
- python3
4555
provisioner:
4656
name: ansible
4757
lint:
@@ -51,6 +61,10 @@ provisioner:
5161
prepare: prepare.yml
5262
converge: playbook.yml
5363
destroy: destroy.yml
64+
inventory:
65+
group_vars:
66+
python3:
67+
ansible_python_interpreter: /usr/bin/python3
5468
scenario:
5569
name: default
5670
verifier:

tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
- name: Gather variables for each operating system
33
include_vars: "{{ item }}"
44
with_first_found:
5+
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
6+
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
7+
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
58
- "{{ ansible_distribution_file_variety | lower }}.yml"
69
- "{{ ansible_distribution | lower }}.yml"
710
- "{{ ansible_os_family | lower }}.yml"

vars/redhat-7.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
process_exporter_dependencies:
3+
- libselinux-python
4+
- policycoreutils-python

vars/redhat.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
process_exporter_dependencies:
3-
- libselinux-python
4-
- policycoreutils-python
3+
- python3-libselinux
4+
- python3-policycoreutils

0 commit comments

Comments
 (0)