Merge pull request #175 from jaredledvina/feature/update-testing-deps

Feature/update testing deps

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Add support for configuring [Tessen](https://docs.sensu.io/sensu-core/1.4/reference/tessen/) via `sensu_enable_tessen` (@jaredledvina)
 - Stop publishing development/testing files to Ansible Galaxy (@jaredledvina)
 - Update molecule's testing configuration for speed and task profiling (@jaredledvina)
+- Update Inspec to latest stable & refactor shared testing files (@jaredledvina)
 
 ## [2.5.0] - 2018-06-16
 ### Changed

Pipfile.lock

@@ -247,7 +247,7 @@
                 "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79",
                 "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
             ],
-            "markers": "python_version < '3'",
+            "markers": "python_version < '3.4'",
             "version": "==1.1.6"
         },
         "fasteners": {

molecule/amazonlinux/molecule.yml

@@ -7,7 +7,6 @@ driver:
   name: docker
 lint:
   name: yamllint
-  enabled: True
 platforms:
   - name: amazonlinux-1
     image: dokken/amazonlinux
@@ -33,14 +32,13 @@ provisioner:
     connection:
       pipelining: true
   playbooks:
-    prepare: ../default/prepare.yml
-    create: ../default/create.yml
-    destroy: ../default/destroy.yml
-    converge: ../default/playbook.yml
-    verify: ../default/verify.yml
+    prepare: ../shared/prepare.yml
+    create: ../shared/create.yml
+    destroy: ../shared/destroy.yml
+    converge: ../shared/playbook.yml
+    verify: ../shared/verify.yml
   lint:
     name: ansible-lint
-    enabled: True
   inventory:
     group_vars:
       all:
@@ -55,14 +53,13 @@ provisioner:
           address: 127.0.0.1
     host_vars:
       amazonlinux-1:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/6/inspec-2.1.68-1.el6.x86_64.rpm
-        inspec_download_sha256sum: a62bc8d8ea803a72b7e834f5993c1d9eab50539293365a067cd29736daeb3fea
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/el/6/inspec-2.2.16-1.el6.x86_64.rpm
+        inspec_download_sha256sum: 616af0700b3c80f545d143dfe24c987039a8d715cbb615aac5ad94b0e0b34323
       amazonlinux-2:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/7/inspec-2.1.68-1.el7.x86_64.rpm
-        inspec_download_sha256sum: 54fb2aab023a228c8f622653daabed14f2345780ec978670dbd262a63ad06fe9
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/el/7/inspec-2.2.16-1.el7.x86_64.rpm
+        inspec_download_sha256sum: 2fdf2000630c38828c3172d471a61ecc4b8ff58ce9bee9a5543a99434be30e83
 verifier:
   name: inspec
-  directory: ../default/tests/
+  directory: ../shared/tests/
   lint:
     name: rubocop
-    enabled: true

molecule/centos/molecule.yml

@@ -7,7 +7,6 @@ driver:
   name: docker
 lint:
   name: yamllint
-  enabled: True
 platforms:
   - name: centos-6
     image: dokken/centos-6
@@ -33,14 +32,13 @@ provisioner:
     connection:
       pipelining: true
   playbooks:
-    prepare: ../default/prepare.yml
-    create: ../default/create.yml
-    destroy: ../default/destroy.yml
-    converge: ../default/playbook.yml
-    verify: ../default/verify.yml
+    prepare: ../shared/prepare.yml
+    create: ../shared/create.yml
+    destroy: ../shared/destroy.yml
+    converge: ../shared/playbook.yml
+    verify: ../shared/verify.yml
   lint:
     name: ansible-lint
-    enabled: True
   inventory:
     group_vars:
       all:
@@ -55,14 +53,13 @@ provisioner:
           address: 127.0.0.1
     host_vars:
       centos-6:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/6/inspec-2.1.68-1.el6.x86_64.rpm
-        inspec_download_sha256sum: a62bc8d8ea803a72b7e834f5993c1d9eab50539293365a067cd29736daeb3fea
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/el/6/inspec-2.2.16-1.el6.x86_64.rpm
+        inspec_download_sha256sum: 616af0700b3c80f545d143dfe24c987039a8d715cbb615aac5ad94b0e0b34323
       centos-7:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/7/inspec-2.1.68-1.el7.x86_64.rpm
-        inspec_download_sha256sum: 54fb2aab023a228c8f622653daabed14f2345780ec978670dbd262a63ad06fe9
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/el/7/inspec-2.2.16-1.el7.x86_64.rpm
+        inspec_download_sha256sum: 2fdf2000630c38828c3172d471a61ecc4b8ff58ce9bee9a5543a99434be30e83
 verifier:
   name: inspec
-  directory: ../default/tests/
+  directory: ../shared/tests/
   lint:
     name: rubocop
-    enabled: true

molecule/debian/molecule.yml

@@ -7,7 +7,6 @@ driver:
   name: docker
 lint:
   name: yamllint
-  enabled: True
 platforms:
   - name: debian-8
     image: dokken/debian-8
@@ -34,14 +33,13 @@ provisioner:
     connection:
       pipelining: true
   playbooks:
-    prepare: ../default/prepare.yml
-    create: ../default/create.yml
-    destroy: ../default/destroy.yml
-    converge: ../default/playbook.yml
-    verify: ../default/verify.yml
+    prepare: ../shared/prepare.yml
+    create: ../shared/create.yml
+    destroy: ../shared/destroy.yml
+    converge: ../shared/playbook.yml
+    verify: ../shared/verify.yml
   lint:
     name: ansible-lint
-    enabled: True
   inventory:
     group_vars:
       all:
@@ -56,14 +54,13 @@ provisioner:
           address: 127.0.0.1
     host_vars:
       debian-8:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/16.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/ubuntu/16.04/inspec_2.2.16-1_amd64.deb
+        inspec_download_sha256sum: c65a9ee4a38dac46760caf2500b4504ba49845423420be685aa8ea20ea52f3b4
       debian-9:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/16.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/ubuntu/16.04/inspec_2.2.16-1_amd64.deb
+        inspec_download_sha256sum: c65a9ee4a38dac46760caf2500b4504ba49845423420be685aa8ea20ea52f3b4
 verifier:
   name: inspec
-  directory: ../default/
+  directory: ../shared/
   lint:
     name: rubocop
-    enabled: true

molecule/default/Dockerfile.j2

@@ -1,14 +0,0 @@
-# Molecule managed
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
-    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi

molecule/default/INSTALL.rst

@@ -1,16 +0,0 @@
-*******
-Install
-*******
-
-Requirements
-============
-
-* Docker Engine
-* docker-py
-
-Install
-=======
-
-.. code-block:: bash
-
-  $ sudo pip install docker-py

molecule/default/molecule.yml

@@ -1,140 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: docker
-lint:
-  name: yamllint
-  enabled: True
-platforms:
-  - name: debian-8
-    image: dokken/debian-8
-    command: /lib/systemd/systemd
-    privileged: yes
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: debian-9
-    image: dokken/debian-9
-    command: /lib/systemd/systemd
-    capabilities:
-      - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: ubuntu-14.04
-    image: dokken/ubuntu-14.04
-    command: /sbin/init
-    capabilities:
-      - SYS_ADMIN
-  - name: ubuntu-16.04
-    image: dokken/ubuntu-16.04
-    command: /bin/systemd
-    capabilities:
-      - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: ubuntu-18.04
-    image: dokken/ubuntu-18.04
-    command: /bin/systemd
-    capabilities:
-      - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: centos-6
-    image: dokken/centos-6
-    command: /sbin/init
-    capabilities:
-      - SYS_ADMIN
-  - name: centos-7
-    image: dokken/centos-7
-    command: /usr/lib/systemd/systemd
-    capabilities:
-      - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: fedora-26
-    image: dokken/fedora-26
-    command: /usr/lib/systemd/systemd
-    capabilities:
-      - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: fedora-27
-    image: dokken/fedora-27
-    command: /usr/lib/systemd/systemd
-    capabilities:
-      - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: fedora-28
-    image: dokken/fedora-latest
-    command: /usr/lib/systemd/systemd
-    capabilities:
-      - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: amazonlinux-1
-    image: dokken/amazonlinux
-    command: /sbin/init
-    capabilities:
-      - SYS_ADMIN
-  - name: amazonlinux-2
-    image: dokken/amazonlinux-2
-    command: /usr/lib/systemd/systemd
-    capabilities:
-      - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-provisioner:
-  name: ansible
-  config_options:
-    defaults:
-      callback_whitelist: timer,profile_tasks
-      fact_caching: jsonfile
-      fact_caching_connection: ./cache
-      poll_interval: 3
-      forks: 100
-    connection:
-      pipelining: true
-  directory: ../default/
-  lint:
-    name: ansible-lint
-    enabled: True
-  inventory:
-    group_vars:
-      all:
-        sensu_master: true
-        sensu_include_dashboard: true
-        rabbitmq_server: true
-        redis_server: true
-        rabbitmq_host: "{{ ansible_hostname }}"
-        redis_host: "{{ ansible_hostname }}"
-        sensu_api_host: "{{ ansible_hostname }}"
-        ansible_default_ipv4:
-          address: 127.0.0.1
-    host_vars:
-      debian-8:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/16.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
-      debian-9:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/16.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
-      ubuntu-14.04:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/14.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
-      ubuntu-16.04:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/16.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
-      centos-6:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/6/inspec-2.1.68-1.el6.x86_64.rpm
-        inspec_download_sha256sum: a62bc8d8ea803a72b7e834f5993c1d9eab50539293365a067cd29736daeb3fea
-      centos-7:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/7/inspec-2.1.68-1.el7.x86_64.rpm
-        inspec_download_sha256sum: 54fb2aab023a228c8f622653daabed14f2345780ec978670dbd262a63ad06fe9
-scenario:
-  name: default
-verifier:
-  name: inspec
-  directory: ../default/tests/
-  lint:
-    name: rubocop
-    enabled: true

molecule/fedora/molecule.yml

@@ -7,7 +7,6 @@ driver:
   name: docker
 lint:
   name: yamllint
-  enabled: True
 platforms:
   - name: fedora-26
     image: dokken/fedora-26
@@ -42,14 +41,13 @@ provisioner:
     connection:
       pipelining: true
   playbooks:
-    prepare: ../default/prepare.yml
-    create: ../default/create.yml
-    destroy: ../default/destroy.yml
-    converge: ../default/playbook.yml
-    verify: ../default/verify.yml
+    prepare: ../shared/prepare.yml
+    create: ../shared/create.yml
+    destroy: ../shared/destroy.yml
+    converge: ../shared/playbook.yml
+    verify: ../shared/verify.yml
   lint:
     name: ansible-lint
-    enabled: True
   inventory:
     group_vars:
       all:
@@ -64,17 +62,16 @@ provisioner:
           address: 127.0.0.1
     host_vars:
       fedora-26:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/7/inspec-2.1.68-1.el7.x86_64.rpm
-        inspec_download_sha256sum: 54fb2aab023a228c8f622653daabed14f2345780ec978670dbd262a63ad06fe9
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/el/7/inspec-2.2.16-1.el7.x86_64.rpm
+        inspec_download_sha256sum: 2fdf2000630c38828c3172d471a61ecc4b8ff58ce9bee9a5543a99434be30e83
       fedora-27:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/7/inspec-2.1.68-1.el7.x86_64.rpm
-        inspec_download_sha256sum: 54fb2aab023a228c8f622653daabed14f2345780ec978670dbd262a63ad06fe9
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/el/7/inspec-2.2.16-1.el7.x86_64.rpm
+        inspec_download_sha256sum: 2fdf2000630c38828c3172d471a61ecc4b8ff58ce9bee9a5543a99434be30e83
       fedora-28:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/el/7/inspec-2.1.68-1.el7.x86_64.rpm
-        inspec_download_sha256sum: 54fb2aab023a228c8f622653daabed14f2345780ec978670dbd262a63ad06fe9
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/el/7/inspec-2.2.16-1.el7.x86_64.rpm
+        inspec_download_sha256sum: 2fdf2000630c38828c3172d471a61ecc4b8ff58ce9bee9a5543a99434be30e83
 verifier:
   name: inspec
-  directory: ../default/tests/
+  directory: ../shared/tests/
   lint:
     name: rubocop
-    enabled: true

molecule/ubuntu/molecule.yml

@@ -7,7 +7,6 @@ driver:
   name: docker
 lint:
   name: yamllint
-  enabled: True
 platforms:
   - name: ubuntu-14.04
     image: dokken/ubuntu-14.04
@@ -41,14 +40,13 @@ provisioner:
     connection:
       pipelining: true
   playbooks:
-    prepare: ../default/prepare.yml
-    create: ../default/create.yml
-    destroy: ../default/destroy.yml
-    converge: ../default/playbook.yml
-    verify: ../default/verify.yml
+    prepare: ../shared/prepare.yml
+    create: ../shared/create.yml
+    destroy: ../shared/destroy.yml
+    converge: ../shared/playbook.yml
+    verify: ../shared/verify.yml
   lint:
     name: ansible-lint
-    enabled: True
   inventory:
     group_vars:
       all:
@@ -63,17 +61,16 @@ provisioner:
           address: 127.0.0.1
     host_vars:
       ubuntu-14.04:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/14.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/ubuntu/14.04/inspec_2.2.16-1_amd64.deb
+        inspec_download_sha256sum: c65a9ee4a38dac46760caf2500b4504ba49845423420be685aa8ea20ea52f3b4
       ubuntu-16.04:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/16.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/ubuntu/16.04/inspec_2.2.16-1_amd64.deb
+        inspec_download_sha256sum: c65a9ee4a38dac46760caf2500b4504ba49845423420be685aa8ea20ea52f3b4
       ubuntu-18.04:
-        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.1.68/ubuntu/18.04/inspec_2.1.68-1_amd64.deb
-        inspec_download_sha256sum: bb411271af5275c26f0129a61230a1080d22a6e99eb0f1b52223ee9d55827375
+        inspec_download_url: https://packages.chef.io/files/stable/inspec/2.2.16/ubuntu/18.04/inspec_2.2.16-1_amd64.deb
+        inspec_download_sha256sum: c65a9ee4a38dac46760caf2500b4504ba49845423420be685aa8ea20ea52f3b4
 verifier:
   name: inspec
-  directory: ../default/tests/
+  directory: ../shared/tests/
   lint:
     name: rubocop
-    enabled: true