Fix molecule tests so that PR's can properly validated (#180)

* Making molecule work again
* Enable newer os'es
This commit is contained in:
Werner Dijkerman
2023-10-20 18:06:02 +02:00
committed by GitHub
parent 94774fbc8d
commit da55c4a711
5 changed files with 25 additions and 14 deletions

View File

@ -22,23 +22,21 @@ on:
- '.github/workflows/telegraf.yml' - '.github/workflows/telegraf.yml'
jobs: jobs:
molecule: molecule:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
molecule_distro: molecule_distro:
- container: centos7
image: geerlingguy/docker-centos7-ansible:latest
- container: rocky8 - container: rocky8
image: geerlingguy/docker-rockylinux8-ansible image: geerlingguy/docker-rockylinux8-ansible
# - container: rocky9 - container: rocky9
# image: geerlingguy/docker-rockylinux9-ansible image: geerlingguy/docker-rockylinux9-ansible
- container: ubuntu2204
image: geerlingguy/docker-ubuntu2204-ansible:latest
- container: ubuntu2004 - container: ubuntu2004
image: geerlingguy/docker-ubuntu2004-ansible:latest image: geerlingguy/docker-ubuntu2004-ansible:latest
- container: ubuntu1804 - container: ubuntu1804
image: geerlingguy/docker-ubuntu1804-ansible:latest image: geerlingguy/docker-ubuntu1804-ansible:latest
- container: ubuntu1604
image: geerlingguy/docker-ubuntu1604-ansible:latest
- container: debian9 - container: debian9
image: geerlingguy/docker-debian9-ansible:latest image: geerlingguy/docker-debian9-ansible:latest
- container: debian10 - container: debian10
@ -57,7 +55,6 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
curl -so requirements.txt 'https://raw.githubusercontent.com/dj-wasabi/dj-wasabi-release/main/requirements.txt'
pip install -r requirements.txt pip install -r requirements.txt
- name: Run role tests on empty systems in check-mode - name: Run role tests on empty systems in check-mode

View File

@ -9,24 +9,28 @@
Emerson Knapp Emerson Knapp
Farshad Nematdoust Farshad Nematdoust
Greg Greg
Harald Kraemer
Heckel, Robert J Heckel, Robert J
Ilkka Tengvall Ilkka Tengvall
Ismael Ismael
Jack Ivy Jack Ivy
Jeff Mahoney Jeff Mahoney
Jeroen Geusebroek Jeroen Geusebroek
Klett IT
Kyle Kyle
Laurent Hoss Laurent Hoss
Lex Rivera Lex Rivera
Marcin Wito Marcin Wito
Markus Langer Markus Langer
Matt Matt
Max Nasonov
Miroslav Prasil Miroslav Prasil
NotDead NotDead
Olivier Boukili Olivier Boukili
Pascal Pascal
Pavel Savchenko Pavel Savchenko
PeterSzegedi PeterSzegedi
Pieter Lexis (TomTom)
Puneeth Nanjundaswamy Puneeth Nanjundaswamy
Rick Box Rick Box
Rohit Gohri Rohit Gohri

View File

@ -4,6 +4,7 @@ dependency:
driver: driver:
name: docker name: docker
role_name_check: 1
platforms: platforms:
- name: influxdb - name: influxdb
image: influxdb:1.7-alpine image: influxdb:1.7-alpine
@ -19,10 +20,11 @@ platforms:
command: ${MY_MOLECULE_DOCKER_COMMAND:-""} command: ${MY_MOLECULE_DOCKER_COMMAND:-""}
privileged: True privileged: True
pre_build_image: True pre_build_image: True
cgroupns_mode: host
networks: networks:
- name: telegraf - name: telegraf
volumes: volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro - /sys/fs/cgroup:/sys/fs/cgroup:rw
groups: groups:
- telegraf - telegraf
@ -64,5 +66,3 @@ scenario:
name: default name: default
verifier: verifier:
name: testinfra name: testinfra
lint:
name: flake8

View File

@ -4,16 +4,18 @@ dependency:
driver: driver:
name: docker name: docker
role_name_check: 1
platforms: platforms:
- name: telegraf-${MY_MOLECULE_CONTAINER:-centos8} - name: telegraf-${MY_MOLECULE_CONTAINER:-centos8}
image: ${MY_MOLECULE_IMAGE:-"geerlingguy/docker-centos8-ansible"} image: ${MY_MOLECULE_IMAGE:-"geerlingguy/docker-centos8-ansible"}
command: ${MY_MOLECULE_DOCKER_COMMAND:-""} command: ${MY_MOLECULE_DOCKER_COMMAND:-""}
privileged: True privileged: True
pre_build_image: True pre_build_image: True
cgroupns_mode: host
networks: networks:
- name: telegraf - name: telegraf
volumes: volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro - /sys/fs/cgroup:/sys/fs/cgroup:rw
groups: groups:
- telegraf - telegraf
@ -66,5 +68,3 @@ scenario:
- destroy - destroy
verifier: verifier:
name: testinfra name: testinfra
lint:
name: flake8

10
requirements.txt Normal file
View File

@ -0,0 +1,10 @@
ansible==8.2.0
ansible-compat==4.1.7
ansible-core==2.15.2
docker==6.1.3
molecule==6.0.1
molecule-docker==2.1.0
netaddr==0.8.0
pytest==7.4.2
pytest-testinfra==9.0.0
testinfra==6.0.0