Skip to content

Commit

Permalink
Merge pull request #179 from npmdnl/npmdnl-fix-ci
Browse files Browse the repository at this point in the history
Fix and bump CI - README.md changes - pdns45 EOL removal - Removed CI support for EOL debian-9
  • Loading branch information
npmdnl authored Jul 11, 2023
2 parents d16ae14 + 7ea2779 commit 19aa535
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 129 deletions.
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
- "2.13"
- "2.14"
scenario:
- pdns-45
- pdns-46
- pdns-47
- pdns-master
Expand Down
10 changes: 2 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ An Ansible role created by the folks behind PowerDNS to setup the [PowerDNS Auth

## Requirements

An Ansible 2.9 or higher installation.
An Ansible 2.12 or higher installation.

## Dependencies

Expand All @@ -32,12 +32,6 @@ By default, the PowerDNS Authoritative Server is installed from the software rep
- { role: PowerDNS.pdns,
pdns_install_repo: "{{ pdns_auth_powerdns_repo_master }}"

# Install the PowerDNS Authoritative Server from the '4.5.x' official repository
- hosts: all
roles:
- { role: PowerDNS.pdns,
pdns_install_repo: "{{ pdns_auth_powerdns_repo_45 }}"

# Install the PowerDNS Authoritative Server from the '4.6.x' official repository
- hosts: all
roles:
Expand Down Expand Up @@ -353,7 +347,7 @@ To test all the scenarios run

To run a custom molecule command

$ tox -e ansible210 -- molecule test -s pdns-44
$ tox -e ansible214 -- molecule test -s pdns-47

## License

Expand Down
9 changes: 0 additions & 9 deletions molecule/pdns-45/converge.yml

This file was deleted.

94 changes: 0 additions & 94 deletions molecule/pdns-45/molecule.yml

This file was deleted.

2 changes: 1 addition & 1 deletion molecule/pdns-46/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ verifier:
- ../backend-sqlite/
- ../backend-mysql/
- ../systemd-override/
lint: flake8

2 changes: 1 addition & 1 deletion molecule/pdns-47/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ verifier:
- ../backend-sqlite/
- ../backend-mysql/
- ../systemd-override/
lint: flake8

7 changes: 1 addition & 6 deletions molecule/pdns-master/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ platforms:
image: ubuntu:18.04
dockerfile_tpl: debian-systemd

- name: debian-9
groups: ["pdns"]
image: debian:9
dockerfile_tpl: debian-systemd

- name: debian-10
groups: ["pdns"]
image: debian:10
Expand Down Expand Up @@ -87,4 +82,4 @@ verifier:
- ../backend-sqlite/
- ../backend-mysql/
- ../systemd-override/
lint: flake8

2 changes: 1 addition & 1 deletion molecule/pdns-os-repos/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ verifier:
- ../systemd-override/
- ../backend-sqlite/
- ../backend-mysql/
lint: flake8

2 changes: 1 addition & 1 deletion molecule/systemd-no-overrides/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ verifier:
additional_files_or_dirs:
# path relative to 'directory'
- ../systemd-no-override
lint: flake8

2 changes: 2 additions & 0 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
collections:
- name: community.mysql
- name: community.general
- name: community.docker
- name: ansible.posix
14 changes: 7 additions & 7 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ansible-lint==5.4.0
yamllint==1.29.0
molecule[docker]==4.0.0
molecule[lint]==4.0.0
pytest-testinfra==6.7.0
docker==5.0.3

ansible-lint==6.17.2
yamllint==1.32.0
molecule-plugins[docker]==23.4.1
molecule-plugins[lint]==23.4.1
molecule==5.1.0
pytest-testinfra==8.1.0
docker==6.1.3

0 comments on commit 19aa535

Please sign in to comment.