Skip to content
This repository has been archived by the owner on Mar 6, 2023. It is now read-only.

add RHEL8 and debian buster support; remove testing on debian jessie #101

Merged
merged 1 commit into from
Aug 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ matrix:
install:
- pip3 install tox-travis git-semver
script:
- tox
- ./.travis/test.sh
deploy:
provider: script
skip_cleanup: true
Expand Down
13 changes: 11 additions & 2 deletions .travis/test.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
#!/bin/bash

set -euo pipefail

if [ ! -d "./molecule/latest" ]; then
tox
exit 0
fi

if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
tox -- molecule test --all
tox -- molecule test --all --destroy never
else
tox -- molecule test -s default --destroy always
tox -- molecule test -s alternative --destroy never
if [ -d "./molecule/alternative" ]; then
tox -- molecule test -s alternative --destroy never
fi
fi
1 change: 1 addition & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ galaxy_info:
versions:
- jessie
- stretch
- buster
- name: EL
versions:
- 7
Expand Down
6 changes: 3 additions & 3 deletions molecule/alternative/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ platforms:
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- name: jessie
image: paulfantom/debian-molecule:8
- name: buster
image: paulfantom/debian-molecule:10
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
privileged: true
volumes:
Expand All @@ -37,7 +37,7 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- name: fedora
image: paulfantom/fedora-molecule:27
image: paulfantom/fedora-molecule:30
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
privileged: true
volumes:
Expand Down
6 changes: 3 additions & 3 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ platforms:
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- name: jessie
image: paulfantom/debian-molecule:8
- name: buster
image: paulfantom/debian-molecule:10
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
privileged: true
volumes:
Expand All @@ -37,7 +37,7 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- name: fedora
image: paulfantom/fedora-molecule:27
image: paulfantom/fedora-molecule:30
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
privileged: true
volumes:
Expand Down
6 changes: 3 additions & 3 deletions molecule/latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ driver:
lint:
name: yamllint
platforms:
- name: stretch
image: paulfantom/debian-molecule:9
- name: buster
image: paulfantom/debian-molecule:10
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- name: fedora
image: paulfantom/fedora-molecule:27
image: paulfantom/fedora-molecule:30
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
privileged: true
volumes:
Expand Down
1 change: 1 addition & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
- name: Gather variables for each operating system
include_vars: "{{ item }}"
with_first_found:
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution_file_variety | lower }}.yml"
- "{{ ansible_distribution | lower }}.yml"
- "{{ ansible_os_family | lower }}.yml"
Expand Down
1 change: 1 addition & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ docker
ansible-lint>=3.4.0
testinfra>=1.7.0
jmespath
selinux
4 changes: 4 additions & 0 deletions vars/fedora.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
node_exporter_dependencies:
- python3-libselinux
- python3-policycoreutils
4 changes: 4 additions & 0 deletions vars/redhat-8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
node_exporter_dependencies:
- python3-libselinux
- python3-policycoreutils