diff --git a/.kitchen.yml b/.kitchen.yml index 4ab5d50..3d136d5 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -13,6 +13,10 @@ provisioner: platforms: # https://github.com/test-kitchen/kitchen-docker/issues/268#issuecomment-304141235 + - name: centos-6 + driver: + disable_upstart: false + run_command: /sbin/init - name: centos-7 driver_config: image: centos/systemd @@ -21,6 +25,7 @@ platforms: provision_command: - sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config - systemctl enable sshd.service + - name: ubuntu-14.04 - name: ubuntu-16.04 suites: diff --git a/README.md b/README.md index da17253..ec82348 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Testing Locally bundle ``` -1. [Download Nessus Agent packages](https://www.tenable.com/products/nessus/agent-download) for CentOS 7 and Ubuntu 16.04. Put them under `test/integration/default/files/`. +1. [Download Nessus Agent packages](https://www.tenable.com/products/nessus/agent-download) for CentOS 6, CentOS 7, and Ubuntu 14.04/16.04. Put them under `test/integration/default/files/`. 1. Create credentials file. ```sh diff --git a/test/integration/default/default.yml b/test/integration/default/default.yml index 2617ddb..042b0e9 100644 --- a/test/integration/default/default.yml +++ b/test/integration/default/default.yml @@ -1,5 +1,9 @@ --- - hosts: all become: true + pre_tasks: + # not included by default on ubuntu:16.04 image + - name: Install time zone package + package: name=tzdata roles: - ansible-role-nessus-agent diff --git a/test/integration/default/group_vars/all/pkg.yml b/test/integration/default/group_vars/all/pkg.yml index e58b4d6..dedcaee 100644 --- a/test/integration/default/group_vars/all/pkg.yml +++ b/test/integration/default/group_vars/all/pkg.yml @@ -2,6 +2,10 @@ nessus_agent_version: "7.0.0" # https://docs.tenable.com/cloud/Content/AdditionalResources/InstallNessusAgent.htm nessus_agent_packages: - CentOS: NessusAgent-{{ nessus_agent_version }}-es7.x86_64.rpm - Ubuntu: NessusAgent-{{ nessus_agent_version }}-ubuntu1110_amd64.deb -nessus_agent_package: "{{ role_path }}/test/integration/default/files/{{ nessus_agent_packages[ansible_distribution] }}" + CentOS: + 6: NessusAgent-{{ nessus_agent_version }}-es6.x86_64.rpm + 7: NessusAgent-{{ nessus_agent_version }}-es7.x86_64.rpm + Ubuntu: + 14: NessusAgent-{{ nessus_agent_version }}-ubuntu1110_amd64.deb + 16: NessusAgent-{{ nessus_agent_version }}-ubuntu1110_amd64.deb +nessus_agent_package: "{{ role_path }}/test/integration/default/files/{{ nessus_agent_packages[ansible_distribution][ansible_distribution_major_version | int] }}"