test: Add Debian 9 and 10 to molecule platforms

meta/main.yml

@@ -6,14 +6,18 @@ galaxy_info:
   license: MIT
   min_ansible_version: 2.0
   platforms:
-    - name: Ubuntu
+    - name: Debian
       versions:
-        - bionic
-        - xenial
+        - stretch
+        - buster
     - name: EL
       versions:
         - 7
         - 8
+    - name: Ubuntu
+      versions:
+        - bionic
+        - xenial
   galaxy_tags:
     - adblocking
     - adguard

molecule/change-to-non-root-user/Dockerfile.j2

@@ -39,3 +39,5 @@ RUN if [ $(command -v apt-get) ]; then \
         xbps-install -y python sudo bash ca-certificates && \
         xbps-remove -O; \
     fi
+
+RUN if [ ! -e /sbin/init ]; then ln -s /lib/systemd/systemd /sbin/init; fi

molecule/change-to-non-root-user/molecule.yml

@@ -22,6 +22,24 @@ platforms:
       - /tmp
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: debian-9
+    image: jrei/systemd-debian:9
+    command: /sbin/init
+    privileged: true
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: debian-10
+    image: jrei/systemd-debian:10
+    command: /sbin/init
+    privileged: true
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: ubuntu-16.04
     image: jrei/systemd-ubuntu:16.04
     command: /sbin/init

molecule/change-to-non-root-user/tests/test_default.py

@@ -47,7 +47,7 @@ def test_adguardhome_binary(host):
 
 
 def test_adguardhome_service(host):
-    s = host.service('adguardhome')
+    s = host.service('adguardhome.service')
 
     assert s.is_enabled
     assert s.is_running

molecule/default/Dockerfile.j2

@@ -39,3 +39,5 @@ RUN if [ $(command -v apt-get) ]; then \
         xbps-install -y python sudo bash ca-certificates && \
         xbps-remove -O; \
     fi
+
+RUN if [ ! -e /sbin/init ]; then ln -s /lib/systemd/systemd /sbin/init; fi

molecule/default/molecule.yml

@@ -22,6 +22,24 @@ platforms:
       - /tmp
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: debian-9
+    image: jrei/systemd-debian:9
+    command: /sbin/init
+    privileged: true
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: debian-10
+    image: jrei/systemd-debian:10
+    command: /sbin/init
+    privileged: true
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: ubuntu-16.04
     image: jrei/systemd-ubuntu:16.04
     command: /sbin/init

molecule/default/tests/test_default.py

@@ -37,7 +37,7 @@ def test_adguardhome_binary(host):
 
 
 def test_adguardhome_service(host):
-    s = host.service('adguardhome')
+    s = host.service('adguardhome.service')
 
     assert s.is_enabled
     assert s.is_running

molecule/with-config/Dockerfile.j2

@@ -39,3 +39,5 @@ RUN if [ $(command -v apt-get) ]; then \
         xbps-install -y python sudo bash ca-certificates && \
         xbps-remove -O; \
     fi
+
+RUN if [ ! -e /sbin/init ]; then ln -s /lib/systemd/systemd /sbin/init; fi

molecule/with-config/molecule.yml

@@ -22,6 +22,24 @@ platforms:
       - /tmp
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: debian-9
+    image: jrei/systemd-debian:9
+    command: /sbin/init
+    privileged: true
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: debian-10
+    image: jrei/systemd-debian:10
+    command: /sbin/init
+    privileged: true
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: ubuntu-16.04
     image: jrei/systemd-ubuntu:16.04
     command: /sbin/init

molecule/with-config/tests/test_default.py

@@ -47,7 +47,7 @@ def test_adguardhome_binary(host):
 
 
 def test_adguardhome_service(host):
-    s = host.service('adguardhome')
+    s = host.service('adguardhome.service')
 
     assert s.is_enabled
     assert s.is_running