Merge pull request #16 from devops-coop/feature-inspec

benwebber · web-flow · commit 7ca89a185a8e · 2017-05-20T21:36:11.000+08:00
Updated tests to use inspec
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,6 @@ env:
     - OS=centos7  SERVER=minecraft PROCESS_CONTROL=systemd
     - OS=jessie64 SERVER=spigot    PROCESS_CONTROL=systemd
     - OS=jessie64 SERVER=spigot    PROCESS_CONTROL=supervisor
-    - OS=trusty64 SERVER=spigot    PROCESS_CONTROL=supervisor
     - OS=xenial64 SERVER=spigot    PROCESS_CONTROL=systemd
     - OS=centos7  SERVER=spigot    PROCESS_CONTROL=systemd
 before_install:
diff --git a/README.rst b/README.rst
@@ -41,7 +41,7 @@ Features
    +----------------+--------------+-----------+
 
 -  safely stops the server using `stop <http://minecraft.gamepedia.com/Commands#stop>`__ when running under **systemd**
--  uses `Docker <https://www.docker.com/>`__ and `Serverspec <http://serverspec.org/>`__ to run integration tests
+-  uses `Docker <https://www.docker.com/>`__ and `Inspec <https://www.chef.io/inspec/>`__ to run integration tests
 -  manages user ACLs
 -  manages ``server.properties``
 -  hooks: include arbitrary tasks at specific stages during execution
diff --git a/docker/centos7/Dockerfile b/docker/centos7/Dockerfile
@@ -2,15 +2,15 @@ FROM centos:7
 
 ENV TERM=xterm
 
-RUN yum install -y epel-release \
+COPY chef.asc /tmp/chef.asc
+COPY chef-stable.repo /etc/yum.repos.d/chef-stable.repo
+
+RUN rpm --import /tmp/chef.asc \
+    && yum install -y epel-release \
     && yum install -y \
       ansible \
-      git \
-      iproute \
-      java-1.8.0-openjdk \
-      ruby \
-      sudo \
-      tar \
+      inspec-1.25.0-1.el7 \
+      wget \
+      coreutils \
+      net-tools \
     && yum clean all
-
-RUN gem install serverspec
diff --git a/docker/centos7/chef-stable.repo b/docker/centos7/chef-stable.repo
@@ -0,0 +1,5 @@
+[chef-stable]
+name=chef-stable
+baseurl=https://packages.chef.io/repos/yum/stable/el/7/\$basearch/
+gpgcheck=1
+enabled=1
diff --git a/docker/centos7/chef.asc b/docker/centos7/chef.asc
@@ -0,0 +1,34 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+mQGiBEppC7QRBADfsOkZU6KZK+YmKw4wev5mjKJEkVGlus+NxW8wItX5sGa6kdUu
+twAyj7Yr92rF+ICFEP3gGU6+lGo0Nve7KxkN/1W7/m3G4zuk+ccIKmjp8KS3qn99
+dxy64vcji9jIllVa+XXOGIp0G8GEaj7mbkixL/bMeGfdMlv8Gf2XPpp9vwCgn/GC
+JKacfnw7MpLKUHOYSlb//JsEAJqao3ViNfav83jJKEkD8cf59Y8xKia5OpZqTK5W
+ShVnNWS3U5IVQk10ZDH97Qn/YrK387H4CyhLE9mxPXs/ul18ioiaars/q2MEKU2I
+XKfV21eMLO9LYd6Ny/Kqj8o5WQK2J6+NAhSwvthZcIEphcFignIuobP+B5wNFQpe
+DbKfA/0WvN2OwFeWRcmmd3Hz7nHTpcnSF+4QX6yHRF/5BgxkG6IqBIACQbzPn6Hm
+sMtm/SVf11izmDqSsQptCrOZILfLX/mE+YOl+CwWSHhl+YsFts1WOuh1EhQD26aO
+Z84HuHV5HFRWjDLw9LriltBVQcXbpfSrRP5bdr7Wh8vhqJTPjrQnT3BzY29kZSBQ
+YWNrYWdlcyA8cGFja2FnZXNAb3BzY29kZS5jb20+iGAEExECACAFAkppC7QCGwMG
+CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRApQKupg++Caj8sAKCOXmdG36gWji/K
++o+XtBfvdMnFYQCfTCEWxRy2BnzLoBBFCjDSK6sJqCu0IENIRUYgUGFja2FnZXMg
+PHBhY2thZ2VzQGNoZWYuaW8+iGIEExECACIFAlQwYFECGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAAoJEClAq6mD74JqX94An26z99XOHWpLN8ahzm7cp13t4Xid
+AJ9wVcgoUBzvgg91lKfv/34cmemZn7kCDQRKaQu0EAgAg7ZLCVGVTmLqBM6njZEd
+Zbv+mZbvwLBSomdiqddE6u3eH0X3GuwaQfQWHUVG2yedyDMiG+EMtCdEeeRebTCz
+SNXQ8Xvi22hRPoEsBSwWLZI8/XNg0n0f1+GEr+mOKO0BxDB2DG7DA0nnEISxwFkK
+OFJFebR3fRsrWjj0KjDxkhse2ddU/jVz1BY7Nf8toZmwpBmdozETMOTx3LJy1HZ/
+Te9FJXJMUaB2lRyluv15MVWCKQJro4MQG/7QGcIfrIZNfAGJ32DDSjV7/YO+IpRY
+IL4CUBQ65suY4gYUG4jhRH6u7H1p99sdwsg5OIpBe/v2Vbc/tbwAB+eJJAp89Zeu
+twADBQf/ZcGoPhTGFuzbkcNRSIz+boaeWPoSxK2DyfScyCAuG41CY9+g0HIw9Sq8
+DuxQvJ+vrEJjNvNE3EAEdKl/zkXMZDb1EXjGwDi845TxEMhhD1dDw2qpHqnJ2mtE
+WpZ7juGwA3sGhi6FapO04tIGacCfNNHmlRGipyq5ZiKIRq9mLEndlECr8cwaKgkS
+0wWu+xmMZe7N5/t/TK19HXNh4tVacv0F3fYK54GUjt2FjCQV75USnmNY4KPTYLXA
+dzC364hEMlXpN21siIFgB04w+TXn5UF3B4FfAy5hevvr4DtV4MvMiGLu0oWjpaLC
+MpmrR3Ny2wkmO0h+vgri9uIP06ODWIhJBBgRAgAJBQJKaQu0AhsMAAoJEClAq6mD
+74Jq4hIAoJ5KrYS8kCwj26SAGzglwggpvt3CAJ0bekyky56vNqoegB+y4PQVDv4K
+zA==
+=IxPr
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/docker/jessie64/Dockerfile b/docker/jessie64/Dockerfile
@@ -1,35 +1,26 @@
 # vim: set ft=dockerfile:
 
-# Requires Ansible 1.8+ from jessie-backports.
-FROM debian:jessie-backports
+FROM debian:jessie
 
 # Colour output.
 ENV TERM=xterm
 
-# Defaults to graphical.target.
-RUN systemctl set-default multi-user.target
-
-RUN apt-get update -y \
+RUN echo deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main >> /etc/apt/sources.list \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
+    && apt-get update -y \
     && apt-get --no-install-recommends install -y \
-      default-jdk \
-      gcc \
-      git \
-      libffi-dev \
-      libssl-dev \
+      software-properties-common \
+      ansible \
+      wget \
+      coreutils \
       net-tools \
-      python-dev \
-      python-pip \
-      ruby \
-      sudo \
-      tar \
     && apt-get autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN pip install -U setuptools
-
-# A newish version of ansible is required, so install from pip instead of from
-# the old Debian package.
-RUN pip install ansible
-
-RUN gem install serverspec
+## https://downloads.chef.io/inspec/1.24.0
+RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/ubuntu/14.04/inspec_1.24.0-1_amd64.deb \
+  && echo "33e8ab3dd4ed7eb2285310ae9d0a32e0cc45d5b6d057a29541f93870c2f9e30a  inspec_1.24.0-1_amd64.deb" \
+  | sha256sum -c \
+  && dpkg -i inspec_1.24.0-1_amd64.deb \
+  && rm inspec_1.24.0-1_amd64.deb
diff --git a/docker/trusty64/Dockerfile b/docker/trusty64/Dockerfile
@@ -6,19 +6,23 @@ FROM ubuntu:trusty
 ENV TERM=xterm
 
 RUN apt-get update -y \
-    && apt-get install -y software-properties-common \
+    && apt-get install -y apt-transport-https software-properties-common \
+    && apt-get autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY chef.asc /tmp/chef.asc
+COPY chef-stable.list /etc/apt/sources.list.d/chef-stable.list
+
+RUN apt-key add /tmp/chef.asc \
     && apt-add-repository ppa:ansible/ansible \
     && apt-get update -y \
     && apt-get --no-install-recommends install -y \
       ansible \
-      default-jdk \
-      git \
+      inspec=1.25.0-1 \
+      wget \
+      coreutils \
       net-tools \
-      ruby2.0 \
-      sudo \
-      tar \
     && apt-get autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
-
-RUN gem2.0 install serverspec
diff --git a/docker/trusty64/chef-stable.list b/docker/trusty64/chef-stable.list
@@ -0,0 +1 @@
+deb https://packages.chef.io/repos/apt/stable trusty main
diff --git a/docker/trusty64/chef.asc b/docker/trusty64/chef.asc
@@ -0,0 +1,34 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+mQGiBEppC7QRBADfsOkZU6KZK+YmKw4wev5mjKJEkVGlus+NxW8wItX5sGa6kdUu
+twAyj7Yr92rF+ICFEP3gGU6+lGo0Nve7KxkN/1W7/m3G4zuk+ccIKmjp8KS3qn99
+dxy64vcji9jIllVa+XXOGIp0G8GEaj7mbkixL/bMeGfdMlv8Gf2XPpp9vwCgn/GC
+JKacfnw7MpLKUHOYSlb//JsEAJqao3ViNfav83jJKEkD8cf59Y8xKia5OpZqTK5W
+ShVnNWS3U5IVQk10ZDH97Qn/YrK387H4CyhLE9mxPXs/ul18ioiaars/q2MEKU2I
+XKfV21eMLO9LYd6Ny/Kqj8o5WQK2J6+NAhSwvthZcIEphcFignIuobP+B5wNFQpe
+DbKfA/0WvN2OwFeWRcmmd3Hz7nHTpcnSF+4QX6yHRF/5BgxkG6IqBIACQbzPn6Hm
+sMtm/SVf11izmDqSsQptCrOZILfLX/mE+YOl+CwWSHhl+YsFts1WOuh1EhQD26aO
+Z84HuHV5HFRWjDLw9LriltBVQcXbpfSrRP5bdr7Wh8vhqJTPjrQnT3BzY29kZSBQ
+YWNrYWdlcyA8cGFja2FnZXNAb3BzY29kZS5jb20+iGAEExECACAFAkppC7QCGwMG
+CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRApQKupg++Caj8sAKCOXmdG36gWji/K
++o+XtBfvdMnFYQCfTCEWxRy2BnzLoBBFCjDSK6sJqCu0IENIRUYgUGFja2FnZXMg
+PHBhY2thZ2VzQGNoZWYuaW8+iGIEExECACIFAlQwYFECGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAAoJEClAq6mD74JqX94An26z99XOHWpLN8ahzm7cp13t4Xid
+AJ9wVcgoUBzvgg91lKfv/34cmemZn7kCDQRKaQu0EAgAg7ZLCVGVTmLqBM6njZEd
+Zbv+mZbvwLBSomdiqddE6u3eH0X3GuwaQfQWHUVG2yedyDMiG+EMtCdEeeRebTCz
+SNXQ8Xvi22hRPoEsBSwWLZI8/XNg0n0f1+GEr+mOKO0BxDB2DG7DA0nnEISxwFkK
+OFJFebR3fRsrWjj0KjDxkhse2ddU/jVz1BY7Nf8toZmwpBmdozETMOTx3LJy1HZ/
+Te9FJXJMUaB2lRyluv15MVWCKQJro4MQG/7QGcIfrIZNfAGJ32DDSjV7/YO+IpRY
+IL4CUBQ65suY4gYUG4jhRH6u7H1p99sdwsg5OIpBe/v2Vbc/tbwAB+eJJAp89Zeu
+twADBQf/ZcGoPhTGFuzbkcNRSIz+boaeWPoSxK2DyfScyCAuG41CY9+g0HIw9Sq8
+DuxQvJ+vrEJjNvNE3EAEdKl/zkXMZDb1EXjGwDi845TxEMhhD1dDw2qpHqnJ2mtE
+WpZ7juGwA3sGhi6FapO04tIGacCfNNHmlRGipyq5ZiKIRq9mLEndlECr8cwaKgkS
+0wWu+xmMZe7N5/t/TK19HXNh4tVacv0F3fYK54GUjt2FjCQV75USnmNY4KPTYLXA
+dzC364hEMlXpN21siIFgB04w+TXn5UF3B4FfAy5hevvr4DtV4MvMiGLu0oWjpaLC
+MpmrR3Ny2wkmO0h+vgri9uIP06ODWIhJBBgRAgAJBQJKaQu0AhsMAAoJEClAq6mD
+74Jq4hIAoJ5KrYS8kCwj26SAGzglwggpvt3CAJ0bekyky56vNqoegB+y4PQVDv4K
+zA==
+=IxPr
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/docker/xenial64/Dockerfile b/docker/xenial64/Dockerfile
@@ -6,15 +6,22 @@ FROM ubuntu:xenial
 ENV TERM=xterm
 
 RUN apt-get update -y \
-    && apt-get install -y software-properties-common \
+    && apt-get install -y apt-transport-https software-properties-common \
+    && apt-get autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY chef.asc /tmp/chef.asc
+COPY chef-stable.list /etc/apt/sources.list.d/chef-stable.list
+
+RUN apt-key add /tmp/chef.asc \
     && apt-add-repository ppa:ansible/ansible \
     && apt-get update -y \
     && apt-get --no-install-recommends install -y \
       ansible \
+      inspec=1.25.0-1 \
+      coreutils \
       net-tools \
-      ruby2.3 \
     && apt-get autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
-
-RUN gem2.3 install serverspec
diff --git a/docker/xenial64/chef-stable.list b/docker/xenial64/chef-stable.list
@@ -0,0 +1 @@
+deb https://packages.chef.io/repos/apt/stable xenial main
diff --git a/docker/xenial64/chef.asc b/docker/xenial64/chef.asc
@@ -0,0 +1,34 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+mQGiBEppC7QRBADfsOkZU6KZK+YmKw4wev5mjKJEkVGlus+NxW8wItX5sGa6kdUu
+twAyj7Yr92rF+ICFEP3gGU6+lGo0Nve7KxkN/1W7/m3G4zuk+ccIKmjp8KS3qn99
+dxy64vcji9jIllVa+XXOGIp0G8GEaj7mbkixL/bMeGfdMlv8Gf2XPpp9vwCgn/GC
+JKacfnw7MpLKUHOYSlb//JsEAJqao3ViNfav83jJKEkD8cf59Y8xKia5OpZqTK5W
+ShVnNWS3U5IVQk10ZDH97Qn/YrK387H4CyhLE9mxPXs/ul18ioiaars/q2MEKU2I
+XKfV21eMLO9LYd6Ny/Kqj8o5WQK2J6+NAhSwvthZcIEphcFignIuobP+B5wNFQpe
+DbKfA/0WvN2OwFeWRcmmd3Hz7nHTpcnSF+4QX6yHRF/5BgxkG6IqBIACQbzPn6Hm
+sMtm/SVf11izmDqSsQptCrOZILfLX/mE+YOl+CwWSHhl+YsFts1WOuh1EhQD26aO
+Z84HuHV5HFRWjDLw9LriltBVQcXbpfSrRP5bdr7Wh8vhqJTPjrQnT3BzY29kZSBQ
+YWNrYWdlcyA8cGFja2FnZXNAb3BzY29kZS5jb20+iGAEExECACAFAkppC7QCGwMG
+CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRApQKupg++Caj8sAKCOXmdG36gWji/K
++o+XtBfvdMnFYQCfTCEWxRy2BnzLoBBFCjDSK6sJqCu0IENIRUYgUGFja2FnZXMg
+PHBhY2thZ2VzQGNoZWYuaW8+iGIEExECACIFAlQwYFECGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAAoJEClAq6mD74JqX94An26z99XOHWpLN8ahzm7cp13t4Xid
+AJ9wVcgoUBzvgg91lKfv/34cmemZn7kCDQRKaQu0EAgAg7ZLCVGVTmLqBM6njZEd
+Zbv+mZbvwLBSomdiqddE6u3eH0X3GuwaQfQWHUVG2yedyDMiG+EMtCdEeeRebTCz
+SNXQ8Xvi22hRPoEsBSwWLZI8/XNg0n0f1+GEr+mOKO0BxDB2DG7DA0nnEISxwFkK
+OFJFebR3fRsrWjj0KjDxkhse2ddU/jVz1BY7Nf8toZmwpBmdozETMOTx3LJy1HZ/
+Te9FJXJMUaB2lRyluv15MVWCKQJro4MQG/7QGcIfrIZNfAGJ32DDSjV7/YO+IpRY
+IL4CUBQ65suY4gYUG4jhRH6u7H1p99sdwsg5OIpBe/v2Vbc/tbwAB+eJJAp89Zeu
+twADBQf/ZcGoPhTGFuzbkcNRSIz+boaeWPoSxK2DyfScyCAuG41CY9+g0HIw9Sq8
+DuxQvJ+vrEJjNvNE3EAEdKl/zkXMZDb1EXjGwDi845TxEMhhD1dDw2qpHqnJ2mtE
+WpZ7juGwA3sGhi6FapO04tIGacCfNNHmlRGipyq5ZiKIRq9mLEndlECr8cwaKgkS
+0wWu+xmMZe7N5/t/TK19HXNh4tVacv0F3fYK54GUjt2FjCQV75USnmNY4KPTYLXA
+dzC364hEMlXpN21siIFgB04w+TXn5UF3B4FfAy5hevvr4DtV4MvMiGLu0oWjpaLC
+MpmrR3Ny2wkmO0h+vgri9uIP06ODWIhJBBgRAgAJBQJKaQu0AhsMAAoJEClAq6mD
+74Jq4hIAoJ5KrYS8kCwj26SAGzglwggpvt3CAJ0bekyky56vNqoegB+y4PQVDv4K
+zA==
+=IxPr
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts/ci.sh b/scripts/ci.sh
@@ -67,7 +67,8 @@ function main() {
   sleep 30
 
   # Run tests.
-  docker exec -t "${container}" rspec "${WORKSPACE}/tests/spec/${SERVER}_spec.rb"
+  docker exec -t "${container}" inspec exec "${WORKSPACE}/tests/spec/${SERVER}_spec.rb"
+
 }
 
 [[ -z "${CI:-}" ]] && trap debug ERR
diff --git a/tasks/setup/Debian.yml b/tasks/setup/Debian.yml
@@ -1,8 +1,15 @@
+# Required for Java 1.8
+- name: install jessie-backports repository
+  apt_repository:
+    repo: deb http://ftp.debian.org/debian jessie-backports main
+  when: ansible_distribution_release == 'jessie'
+
 - name: install Minecraft dependencies
   apt:
     name: "{{ item }}"
     state: present
     install_recommends: no
+    default_release: "{{ (ansible_distribution_release == 'jessie') | ternary('jessie-backports', omit) }}"
   with_items: "{{ dependencies }}"
 
 - name: install Spigot dependencies
diff --git a/tasks/setup/main.yml b/tasks/setup/main.yml
@@ -1,5 +1,8 @@
 - name: include OS-specific variables
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 - name: include Debian-specific tasks
   include: Debian.yml
diff --git a/tests/spec/minecraft_spec.rb b/tests/spec/minecraft_spec.rb
@@ -1,5 +1,3 @@
-require_relative 'spec_helper'
-
 describe user 'minecraft' do
   it { should exist }
 end
@@ -35,25 +33,25 @@
   its(:content) { should match 'true' }
 end
 
-java = case os[:family]
-       when 'redhat' then 'java-1.8.0-openjdk'
+java = case os[:name]
+       when 'centos' then 'java-1.8.0-openjdk'
+       when 'debian' then 'openjdk-8-jdk'
        else 'default-jdk'
        end
 
 describe package java do
   it { should be_installed }
 end
 
-describe process 'java' do
-  its(:user) { should eq 'minecraft' }
-  its(:args) { should match /java -Xmx1024M -Xms1024M -jar minecraft_server\.jar nogui/ }
+describe processes(Regexp.new("java -Xmx1024M -Xms1024M -jar minecraft_server.jar nogui")) do
+  its('users') { should cmp 'minecraft' }
 end
 
-describe port 25565 do
+describe port(25565) do
   it { should be_listening }
 end
 
-describe port 25564 do
+describe port(25564) do
   it { should be_listening }
 end
 
diff --git a/tests/spec/spec_helper.rb b/tests/spec/spec_helper.rb
diff --git a/tests/spec/spigot_spec.rb b/tests/spec/spigot_spec.rb
@@ -1,5 +1,3 @@
-require_relative 'spec_helper'
-
 describe user 'spigot' do
   it { should exist }
 end
@@ -35,25 +33,25 @@
   its(:content) { should match 'true' }
 end
 
-java = case os[:family]
-       when 'redhat' then 'java-1.8.0-openjdk'
+java = case os[:name]
+       when 'centos' then 'java-1.8.0-openjdk'
+       when 'debian' then 'openjdk-8-jdk'
        else 'default-jdk'
        end
 
 describe package java do
   it { should be_installed }
 end
 
-describe process 'java' do
-  its(:user) { should eq 'spigot' }
-  its(:args) { should match /java -Xmx1024M -Xms1024M -jar spigot\.jar nogui/ }
+describe processes(Regexp.new("java -Xmx1024M -Xms1024M -jar spigot.jar nogui")) do
+  its('users') { should cmp 'spigot' }
 end
 
-describe port 25565 do
+describe port(25565) do
   it { should be_listening }
 end
 
-describe port 25564 do
+describe port(25564) do
   it { should be_listening }
 end
 
diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -1,4 +1,4 @@
 ---
 dependencies:
-  - default-jdk
+  - openjdk-8-jdk
   - sudo
diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml
@@ -0,0 +1,4 @@
+---
+dependencies:
+  - default-jdk
+  - sudo

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+deb https://packages.chef.io/repos/apt/stable trusty main`