Merge pull request #85 from pieterlexis/os-repos-tests

Fix #84 and add tests for os-repos

.travis.yml

@@ -20,17 +20,20 @@ before_install:
 # Ansible versions
 env:
   jobs:
-    - ANSIBLE=2.7 AUTH_VERSION=42
-    - ANSIBLE=2.7 AUTH_VERSION=43
-    - ANSIBLE=2.7 AUTH_VERSION=master
+    - ANSIBLE=2.7 TEST_SCENARIO=pdns-42
+    - ANSIBLE=2.7 TEST_SCENARIO=pdns-43
+    - ANSIBLE=2.7 TEST_SCENARIO=pdns-master
 
-    - ANSIBLE=2.8 AUTH_VERSION=42
-    - ANSIBLE=2.8 AUTH_VERSION=43
-    - ANSIBLE=2.8 AUTH_VERSION=master
+    - ANSIBLE=2.8 TEST_SCENARIO=pdns-42
+    - ANSIBLE=2.8 TEST_SCENARIO=pdns-43
+    - ANSIBLE=2.8 TEST_SCENARIO=pdns-master
 
-    - ANSIBLE=2.9 AUTH_VERSION=42
-    - ANSIBLE=2.9 AUTH_VERSION=43
-    - ANSIBLE=2.9 AUTH_VERSION=master
+    - ANSIBLE=2.9 TEST_SCENARIO=pdns-42
+    - ANSIBLE=2.9 TEST_SCENARIO=pdns-43
+    - ANSIBLE=2.9 TEST_SCENARIO=pdns-master
+
+    - ANSIBLE=2.9 TEST_SCENARIO=pdns-os-repos
+    - ANSIBLE=2.9 TEST_SCENARIO=systemd-no-overrides
 
 jobs:
   allow_failures:
@@ -42,7 +45,7 @@ install:
 
 # Test the current PowerDNS Authoritative Server stable release
 script:
-  - tox -- molecule test -s pdns-${AUTH_VERSION}
+  - tox -- molecule test -s ${TEST_SCENARIO}
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

molecule/pdns-42/molecule.yml

@@ -88,4 +88,5 @@ verifier:
     - ../repo-42/
     - ../backend-sqlite/
     - ../backend-mysql/
+    - ../systemd-override/
   lint: flake8

molecule/pdns-43/molecule.yml

@@ -88,4 +88,5 @@ verifier:
     - ../repo-43/
     - ../backend-sqlite/
     - ../backend-mysql/
+    - ../systemd-override/
   lint: flake8

molecule/pdns-master/molecule.yml

@@ -85,4 +85,5 @@ verifier:
     - ../repo-master/
     - ../backend-sqlite/
     - ../backend-mysql/
+    - ../systemd-override/
   lint: flake8

molecule/pdns-os-repos/molecule.yml

@@ -20,6 +20,11 @@ platforms:
     image: archlinux/base
     dockerfile_tpl: archlinux-systemd
 
+  - name: ubuntu-2004
+    groups: ["pdns"]
+    image: ubuntu:20.04
+    dockerfile_tpl: debian-systemd
+
   # In order to run the tests we need
   # a MySQL container to be up & running
   - name: mysql
@@ -63,6 +68,7 @@ verifier:
   directory: ../resources/tests/all
   additional_files_or_dirs:
     # path relative to 'directory'
+    - ../systemd-override/
     - ../backend-sqlite/
     - ../backend-mysql/
   lint: flake8

molecule/resources/Dockerfile.debian-systemd.j2

@@ -22,4 +22,4 @@ VOLUME [ "/sys/fs/cgroup" ]
 
 CMD ["/sbin/init"]
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash net-tools ca-certificates && apt-get clean; fi
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python python3 sudo bash net-tools ca-certificates && apt-get clean; fi

molecule/resources/host_vars/debian-10.yml

@@ -0,0 +1,4 @@
+---
+
+ansible_python_interpreter: "/usr/bin/python3"
+

molecule/resources/host_vars/ubuntu-2004.yml

@@ -0,0 +1,3 @@
+---
+
+ansible_python_interpreter: "/usr/bin/python3"

molecule/resources/tests/all/test_common.py

@@ -26,15 +26,3 @@ def test_service(host):
     s = host.ansible('service', 'name=pdns state=started enabled=yes')
 
     assert s["changed"] is False
-
-
-def systemd_override(host):
-    smgr = host.ansible("setup")["ansible_facts"]["ansible_service_mgr"]
-    if smgr == 'systemd':
-        fname = '/etc/systemd/system/pdns.service.d/override.conf'
-        f = host.file(fname)
-
-        assert f.exists
-        assert f.user == 'root'
-        assert f.group == 'root'
-        assert f.contains('LimitCORE=infinity')

molecule/resources/tests/systemd-no-override/test_override.py

@@ -0,0 +1,7 @@
+def test_systemd_override(host):
+    smgr = host.ansible("setup")["ansible_facts"]["ansible_service_mgr"]
+    if smgr == 'systemd':
+        fname = '/etc/systemd/system/pdns.service.d/override.conf'
+        f = host.file(fname)
+
+        assert not f.exists

molecule/resources/tests/systemd-override/test_override.py

@@ -0,0 +1,10 @@
+def test_systemd_override(host):
+    smgr = host.ansible("setup")["ansible_facts"]["ansible_service_mgr"]
+    if smgr == 'systemd':
+        fname = '/etc/systemd/system/pdns.service.d/override.conf'
+        f = host.file(fname)
+
+        assert f.exists
+        assert f.user == 'root'
+        assert f.group == 'root'
+        assert f.contains('LimitCORE=infinity')

molecule/resources/vars/pdns-no-overrides.yml

@@ -0,0 +1,23 @@
+---
+
+##
+# PowerDNS Configuration
+##
+
+pdns_config:
+
+  # Turns on master operations
+  master: true
+
+  # Listen Address
+  local-address: "127.0.0.1"
+  local-port: "53"
+
+  # API Configuration
+  api: yes
+  api-key: "powerdns"
+
+  # Embedded webserver
+  webserver: yes
+  webserver-address: "0.0.0.0"
+  webserver-port: "8001"

molecule/systemd-no-overrides/converge.yml

@@ -0,0 +1,7 @@
+---
+
+- hosts: pdns
+  vars_files:
+    - ../resources/vars/pdns-no-overrides.yml
+  roles:
+    - { role: pdns-ansible }

molecule/systemd-no-overrides/molecule.yml

@@ -0,0 +1,56 @@
+---
+
+scenario:
+ name: systemd-no-overrides
+
+driver:
+  name: docker
+
+dependency:
+  name: galaxy
+
+platforms:
+  - name: debian-10
+    groups: ["pdns"]
+    image: debian:10
+    dockerfile_tpl: debian-systemd
+
+  - name: ubuntu-2004
+    groups: ["pdns"]
+    image: ubuntu:20.04
+    dockerfile_tpl: debian-systemd
+
+provisioner:
+  name: ansible
+  options:
+    diff: True
+    v: True
+  config_options:
+    defaults:
+      gathering: smart
+      fact_caching: jsonfile
+      fact_caching_connection: .ansible_cache
+      fact_caching_timeout: 7200
+    ssh_connection:
+      pipelining: true
+  inventory:
+    links:
+      host_vars: ../resources/host_vars/
+  playbooks:
+    create: ../resources/create.yml
+    destroy: ../resources/destroy.yml
+    prepare: ../resources/prepare.yml
+  lint: ansible-lint -x ANSIBLE0006 ANSIBLE0016 306
+
+lint: yamllint defaults tasks meta vars
+
+verifier:
+  name: testinfra
+  options:
+    hosts: "pdns"
+    vvv: True
+  directory: ../resources/tests/all
+  additional_files_or_dirs:
+    # path relative to 'directory'
+    - ../no-systemd-overrides
+  lint: flake8

tasks/configure.yml

@@ -16,6 +16,7 @@
       owner: root
       group: root
     register: _pdns_override_unit
+    when: pdns_service_overrides | length > 0
 
   - name: Reload systemd
     command: systemctl daemon-reload

tasks/database-mysql.yml

@@ -5,14 +5,6 @@
     name: "{{ pdns_mysql_packages }}"
     state: present
 
-- name: Install the MySQL dependencies on Archlinux
-  package:
-    name:
-      - python-pymysql
-      - mariadb-clients
-    state: present
-  when: ansible_os_family == 'Archlinux'
-
 - name: Create the PowerDNS MySQL databases
   mysql_db:
     login_user: "{{ item['value']['priv_user'] }}"

tasks/main.yml

@@ -3,8 +3,9 @@
 - name: Include OS-specific variables
   include_vars: "{{ item }}"
   with_first_found:
-    - "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
     - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
     - "{{ ansible_os_family }}.yml"
   tags:
     - always

vars/Archlinux.yml

@@ -9,6 +9,11 @@ default_pdns_backends_packages: {}
 # The directory where the PowerDNS configuration is located
 default_pdns_config_dir: '/etc/powerdns'
 
+# Packages to install for MySQL support
+pdns_mysql_packages:
+  - python-pymysql
+  - mariadb-clients
+
 # Other defaults
 pdns_user: powerdns
 pdns_group: powerdns

vars/Ubuntu-20.yml

@@ -0,0 +1,30 @@
+---
+
+# The name of the PowerDNS Authoritative Server package
+default_pdns_package_name: "pdns-server"
+
+# The name of the PowerDNS Authoritative Server debug package
+default_pdns_debug_symbols_package_name: "pdns-server-dbg"
+
+# Packages needed to install MySQL
+pdns_mysql_packages:
+  - default-mysql-client
+  - python3-pymysql
+
+# List of PowerDNS Authoritative Server Backends packages on Debian
+default_pdns_backends_packages:
+  geo: pdns-backend-geo
+  geoip: pdns-backend-geoip
+  gmysql: pdns-backend-mysql
+  gpgsql: pdns-backend-pgsql
+  gsqlite3: pdns-backend-sqlite3
+  ldap: pdns-backend-ldap
+  lmdb: pdns-backend-lmdb
+  lua: pdns-backend-lua
+  mydns: pdns-backend-mydns
+  pipe: pdns-backend-pipe
+  remote: pdns-backend-remote
+  tinydns: pdns-backend-tinydns
+
+# The directory where the PowerDNS Authoritative Server configuration is located
+default_pdns_config_dir: "/etc/powerdns"

vars/main.yml

@@ -48,6 +48,6 @@ pdns_auth_powerdns_repo_43:
 default_pdns_service_overrides: >-
   {{  { 'User'  : pdns_user
       , 'Group' : pdns_group
-      } if _pdns_package_version is version('4.3', operator='ge')
+      } if _pdns_running_version is version('4.3', operator='ge')
         else {}
   }}