Update tests for 6.x

.kitchen.yml

@@ -21,9 +21,10 @@ platforms:
       ansible_yum_repo: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
 suites:
-  - name: default
+  - name: 1.x
   - name: tls
-  - name: version5.0
+  - name: 5.x
+  - name: 6.x
 
 transport:
   max_ssh_sessions: 6

Gemfile.lock

@@ -1,44 +1,76 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    artifactory (2.8.2)
-    faraday (0.12.2)
+    builder (3.2.3)
+    erubis (2.7.0)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
-    highline (1.7.8)
+    ffi (1.9.25)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    highline (2.0.0)
+    httpclient (2.8.3)
     kitchen-ansible (0.0.39)
       librarian-ansible
       test-kitchen (~> 1.4)
-    kitchen-vagrant (1.1.0)
+    kitchen-vagrant (1.3.4)
       test-kitchen (~> 1.4)
     librarian (0.1.2)
       highline
       thor (~> 0.15)
     librarian-ansible (3.0.2)
       faraday
       librarian (~> 0.1.0)
-    mixlib-install (2.1.12)
-      artifactory
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    mixlib-install (3.11.5)
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-shellout (2.3.2)
-    mixlib-versioning (1.1.0)
+    mixlib-shellout (2.4.0)
+    mixlib-versioning (1.2.2)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
+    net-ssh (4.2.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    safe_yaml (1.0.4)
-    test-kitchen (1.16.0)
-      mixlib-install (>= 1.2, < 3.0)
+    nori (2.6.0)
+    rubyntlm (0.6.2)
+    rubyzip (1.2.2)
+    test-kitchen (1.23.2)
+      mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
-      safe_yaml (~> 1.0)
-      thor (~> 0.19, < 0.19.2)
-    thor (0.19.1)
+      thor (~> 0.19)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.1)
+    thor (0.20.0)
+    winrm (2.3.0)
+      builder (>= 2.1.2)
+      erubis (~> 2.7)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
+    winrm-elevated (1.1.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.3.1)
+      erubis (~> 2.7)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 1.1)
+      winrm (~> 2.0)
 
 PLATFORMS
   ruby

test/integration/default/default.yml → test/integration/1.x/default.yml

@@ -1,5 +1,7 @@
 - name: test playbook
   hosts: all
-  sudo: yes
+  become: yes
+  vars:
+    filebeat_version: 1.3.1
   roles:
     - ansible-filebeat

test/integration/version5.0/bats/default.bats → test/integration/5.x/bats/default.bats

@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 
-@test "filebeat script is in path" {
-    command -v filebeat.sh
+@test "filebeat binary is in path" {
+    command -v filebeat
 }
 
 @test "/tmp/filebeat is in filebeat.yml config" {

test/integration/version5.0/default.yml → test/integration/5.x/default.yml

@@ -1,6 +1,6 @@
 - name: test filebeat 5.0.0 install
   hosts: all
-  sudo: yes
+  become: yes
   vars:
     filebeat_version: 5.0.0
   roles:

test/integration/6.x/bats/default.bats

@@ -0,0 +1,17 @@
+#!/usr/bin/env bats
+
+@test "filebeat binary is in path" {
+    command -v filebeat
+}
+
+@test "/tmp/filebeat is in filebeat.yml config" {
+    grep "file: {filename: filebeat, path: /tmp/filebeat}" /etc/filebeat/filebeat.yml
+}
+
+@test "filebeat is running" {
+    service filebeat status
+}
+
+@test "ca certificate does not exist" {
+    [ ! -f /etc/filebeat/ca.crt ]
+}

test/integration/6.x/default.yml

@@ -0,0 +1,7 @@
+- name: test filebeat 6.x install
+  hosts: all
+  become: yes
+  vars:
+    filebeat_version: 6.4.2
+  roles:
+    - ansible-filebeat

test/integration/tls/default.yml

@@ -1,6 +1,6 @@
 - name: test playbook
   hosts: all
-  sudo: yes
+  become: yes
   vars:
     filebeat_ca_cert: |-
       -----BEGIN CERTIFICATE-----