Add testing and use correct repository for CentOS/RHEL 8

.travis.yml

@@ -5,10 +5,20 @@ services:
   - docker
 env:
   - scenario: default
+  - scenario: default_alpine
+  - scenario: default_centos
   - scenario: module
+  - scenario: module_alpine
+  - scenario: module_centos
   - scenario: stable_push
+  - scenario: stable_push_alpine
+  - scenario: stable_push_centos
   - scenario: template
+  - scenario: template_alpine
+  - scenario: template_centos
   - scenario: unit
+  - scenario: unit_alpine
+  - scenario: unit_centos
 before_install:
   - sudo apt-get -qq update
 install:

molecule/common/Dockerfile.j2

@@ -19,6 +19,10 @@ RUN \
     apt-get update \
     && apt-get install -y python sudo bash ca-certificates iproute2 curl \
     && apt-get clean; \
+  elif [ $(command -v dnf) ] && [ $(rpm -E %{rhel}) -eq 8 ]; then \
+    dnf makecache \
+    && dnf --assumeyes install python3 python3-devel python3-dnf python3-pip bash iproute \
+    && dnf clean all; \
   elif [ $(command -v dnf) ]; then \
     dnf makecache \
     && dnf --assumeyes install python sudo python-devel python*-dnf bash iproute \

molecule/default/molecule.yml

@@ -4,29 +4,6 @@ driver:
 lint:
   name: yamllint
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: True
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-    tty: True
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -41,9 +18,12 @@ platforms:
     dockerfile: ../common/Dockerfile.j2
 provisioner:
   name: ansible
+  playbooks:
+    converge: ../common/playbook_default.yml
   lint:
     name: ansible-lint
 verifier:
   name: testinfra
+  directory: ../common/test_default
   lint:
     name: flake8

molecule/default_alpine/molecule.yml

@@ -0,0 +1,38 @@
+---
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: alpine-3.8
+    image: alpine:3.8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.9
+    image: alpine:3.9
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.10
+    image: alpine:3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_default.yml
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  directory: ../common/test_default
+  lint:
+    name: flake8

molecule/default_centos/molecule.yml

@@ -0,0 +1,34 @@
+---
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: centos-6
+    image: centos:6
+    dockerfile: ../common/Dockerfile.j2
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_default.yml
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  directory: ../common/test_default
+  lint:
+    name: flake8

molecule/module/molecule.yml

@@ -4,29 +4,6 @@ driver:
 lint:
   name: yamllint
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: True
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-    tty: True
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -41,9 +18,12 @@ platforms:
     dockerfile: ../common/Dockerfile.j2
 provisioner:
   name: ansible
+  playbooks:
+    converge: ../common/playbook_module.yml
   lint:
     name: ansible-lint
 verifier:
   name: testinfra
+  directory: ../common/test_module
   lint:
     name: flake8

molecule/module_alpine/molecule.yml

@@ -0,0 +1,38 @@
+---
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: alpine-3.8
+    image: alpine:3.8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.9
+    image: alpine:3.9
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.10
+    image: alpine:3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_module.yml
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  directory: ../common/test_module
+  lint:
+    name: flake8

molecule/module_centos/molecule.yml

@@ -0,0 +1,34 @@
+---
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: centos-6
+    image: centos:6
+    dockerfile: ../common/Dockerfile.j2
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_module.yml
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  directory: ../common/test_module
+  lint:
+    name: flake8

molecule/stable_push/molecule.yml

@@ -7,29 +7,6 @@ driver:
 lint:
   name: yamllint
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: True
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-    tty: True
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -44,9 +21,12 @@ platforms:
     dockerfile: ../common/Dockerfile.j2
 provisioner:
   name: ansible
+  playbooks:
+    converge: ../common/playbook_stable_push.yml
   lint:
     name: ansible-lint
 verifier:
   name: testinfra
+  directory: ../common/test_stable_push
   lint:
     name: flake8

molecule/stable_push_alpine/molecule.yml

@@ -0,0 +1,41 @@
+---
+dependency:
+  name: shell
+  command: pip install python-nginx
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: alpine-3.8
+    image: alpine:3.8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.9
+    image: alpine:3.9
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.10
+    image: alpine:3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_stable_push.yml
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  directory: ../common/test_stable_push
+  lint:
+    name: flake8

molecule/stable_push_centos/molecule.yml

@@ -0,0 +1,37 @@
+---
+dependency:
+  name: shell
+  command: pip install python-nginx
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: centos-6
+    image: centos:6
+    dockerfile: ../common/Dockerfile.j2
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_stable_push.yml
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  directory: ../common/test_stable_push
+  lint:
+    name: flake8

molecule/template/molecule.yml

@@ -7,29 +7,6 @@ driver:
 lint:
   name: yamllint
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: True
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-    tty: True
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -44,9 +21,12 @@ platforms:
     dockerfile: ../common/Dockerfile.j2
 provisioner:
   name: ansible
+  playbooks:
+    converge: ../common/playbook_template.yml
   lint:
     name: ansible-lint
 verifier:
   name: testinfra
+  directory: ../common/test_template
   lint:
     name: flake8

molecule/template_alpine/molecule.yml

@@ -0,0 +1,41 @@
+---
+dependency:
+  name: shell
+  command: pip install python-nginx
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: alpine-3.8
+    image: alpine:3.8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.9
+    image: alpine:3.9
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.10
+    image: alpine:3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_template.yml
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  directory: ../common/test_template
+  lint:
+    name: flake8

molecule/template_centos/molecule.yml

@@ -0,0 +1,37 @@
+---
+dependency:
+  name: shell
+  command: pip install python-nginx
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: centos-6
+    image: centos:6
+    dockerfile: ../common/Dockerfile.j2
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_template.yml
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  directory: ../common/test_template
+  lint:
+    name: flake8

molecule/unit/molecule.yml

@@ -4,29 +4,6 @@ driver:
 lint:
   name: yamllint
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    command: "/sbin/init"
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: True
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-    tty: True
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -41,5 +18,7 @@ platforms:
     dockerfile: ../common/Dockerfile.j2
 provisioner:
   name: ansible
+  playbooks:
+    converge: ../common/playbook_unit.yml
   lint:
     name: ansible-lint

molecule/unit_alpine/molecule.yml

@@ -0,0 +1,33 @@
+---
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: alpine-3.8
+    image: alpine:3.8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.9
+    image: alpine:3.9
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.10
+    image: alpine:3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_unit.yml
+  lint:
+    name: ansible-lint

molecule/unit_centos/molecule.yml

@@ -0,0 +1,29 @@
+---
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: centos-6
+    image: centos:6
+    dockerfile: ../common/Dockerfile.j2
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: True
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ../common/playbook_unit.yml
+  lint:
+    name: ansible-lint

tasks/modules/install-modules.yml

@@ -6,16 +6,23 @@
   when: nginx_modules.perl | default(false)
 
 - import_tasks: install-geoip.yml
-  when: nginx_modules.geoip | default(false)
+  when:
+    - nginx_modules.geoip | default(false)
+    - ansible_os_family != "RedHat"
+    - ansible_distribution_major_version != "8"
 
 - import_tasks: install-image-filter.yml
   when: nginx_modules.image_filter | default(false)
 
 - import_tasks: install-rtmp.yml
-  when: nginx_modules.rtmp | default(false) and nginx_type == "plus"
+  when:
+    - nginx_modules.rtmp | default(false)
+    - nginx_type == "plus"
 
 - import_tasks: install-xslt.yml
   when: nginx_modules.xslt | default(false)
 
 - import_tasks: install-waf.yml
-  when: nginx_modules.waf | default(false) and nginx_type == "plus"
+  when:
+    - nginx_modules.waf | default(false)
+    - nginx_type == "plus"

tasks/modules/install-perl.yml

@@ -1,4 +1,9 @@
 ---
+- name: "(Install: All OSs) Install Perl Dependency"
+  package:
+    name: perl
+    state: present
+
 - name: "(Install: All OSs) Install NGINX Open Source Perl Module"
   package:
     name: nginx-module-perl

tasks/opensource/install-oss-linux.yml

@@ -14,13 +14,11 @@
     - import_tasks: setup-suse.yml
       when: ansible_os_family == "Suse"
 
-  when:
+  when: nginx_install_from == "nginx_repository"
-    - nginx_install_from == "nginx_repository"
 
 - name: "(Install: Linux) Install NGINX package"
   package:
     name: "nginx{{ nginx_version | default('') }}"
     state: present
-  when:
+  when: nginx_install_from == "os_repository"
-    - nginx_install_from == "os_repository"
   notify: "(Handler: All OSs) Start NGINX"

tasks/opensource/setup-redhat.yml

@@ -18,7 +18,13 @@
     enabled: yes
     gpgcheck: yes
 
+- name: "(Install: CentOS/RedHat) Install Required CentOS/RedHat Dependencies"
+  yum:
+    name: openssl
+
 - name: "(Install: CentOS/RedHat) Install NGINX"
   yum:
     name: "nginx{{ nginx_version | default('') }}"
+    disablerepo: "*"
+    enablerepo: "nginx"
   notify: "(Handler: All OSs) Start NGINX"