test: replace kitchen to molecule
This commit is contained in:
parent
a108dfbb55
commit
1afd1fcf6c
12 changed files with 78 additions and 202 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1 +1,2 @@
|
||||||
.kitchen/*
|
.kitchen/*
|
||||||
|
*.pyc
|
||||||
|
|
|
@ -5,6 +5,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- test: replace kitchen to molecule
|
||||||
|
|
||||||
## v1.0.0 - 2019-11-09
|
## v1.0.0 - 2019-11-09
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
8
Gemfile
8
Gemfile
|
@ -1,8 +0,0 @@
|
||||||
source 'https://rubygems.org'
|
|
||||||
|
|
||||||
group :development do
|
|
||||||
gem 'kitchen-ansible'
|
|
||||||
gem 'kitchen-docker_cli'
|
|
||||||
gem 'rubocop', '0.50.0'
|
|
||||||
gem 'test-kitchen'
|
|
||||||
end
|
|
130
Gemfile.lock
130
Gemfile.lock
|
@ -1,130 +0,0 @@
|
||||||
GEM
|
|
||||||
remote: https://rubygems.org/
|
|
||||||
specs:
|
|
||||||
ast (2.4.0)
|
|
||||||
bcrypt_pbkdf (1.0.1)
|
|
||||||
builder (3.2.3)
|
|
||||||
ed25519 (1.2.4)
|
|
||||||
equatable (0.6.1)
|
|
||||||
erubis (2.7.0)
|
|
||||||
ffi (1.11.1)
|
|
||||||
gssapi (1.3.0)
|
|
||||||
ffi (>= 1.0.1)
|
|
||||||
gyoku (1.3.1)
|
|
||||||
builder (>= 2.1.2)
|
|
||||||
httpclient (2.8.3)
|
|
||||||
kitchen-ansible (0.50.1)
|
|
||||||
net-ssh (>= 3)
|
|
||||||
test-kitchen (>= 1.4)
|
|
||||||
kitchen-docker_cli (0.19.0)
|
|
||||||
test-kitchen (>= 1.3)
|
|
||||||
license-acceptance (1.0.13)
|
|
||||||
pastel (~> 0.7)
|
|
||||||
tomlrb (~> 1.2)
|
|
||||||
tty-box (~> 0.3)
|
|
||||||
tty-prompt (~> 0.18)
|
|
||||||
little-plugger (1.1.4)
|
|
||||||
logging (2.2.2)
|
|
||||||
little-plugger (~> 1.1)
|
|
||||||
multi_json (~> 1.10)
|
|
||||||
mixlib-install (3.11.21)
|
|
||||||
mixlib-shellout
|
|
||||||
mixlib-versioning
|
|
||||||
thor
|
|
||||||
mixlib-shellout (3.0.7)
|
|
||||||
mixlib-versioning (1.2.7)
|
|
||||||
multi_json (1.13.1)
|
|
||||||
necromancer (0.5.0)
|
|
||||||
net-scp (2.0.0)
|
|
||||||
net-ssh (>= 2.6.5, < 6.0.0)
|
|
||||||
net-ssh (5.2.0)
|
|
||||||
net-ssh-gateway (2.0.0)
|
|
||||||
net-ssh (>= 4.0.0)
|
|
||||||
nori (2.6.0)
|
|
||||||
parallel (1.17.0)
|
|
||||||
parser (2.6.4.0)
|
|
||||||
ast (~> 2.4.0)
|
|
||||||
pastel (0.7.3)
|
|
||||||
equatable (~> 0.6)
|
|
||||||
tty-color (~> 0.5)
|
|
||||||
powerpack (0.1.2)
|
|
||||||
rainbow (2.2.2)
|
|
||||||
rake
|
|
||||||
rake (12.3.3)
|
|
||||||
rubocop (0.50.0)
|
|
||||||
parallel (~> 1.10)
|
|
||||||
parser (>= 2.3.3.1, < 3.0)
|
|
||||||
powerpack (~> 0.1)
|
|
||||||
rainbow (>= 2.2.2, < 3.0)
|
|
||||||
ruby-progressbar (~> 1.7)
|
|
||||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
|
||||||
ruby-progressbar (1.10.1)
|
|
||||||
rubyntlm (0.6.2)
|
|
||||||
rubyzip (1.2.3)
|
|
||||||
strings (0.1.6)
|
|
||||||
strings-ansi (~> 0.1)
|
|
||||||
unicode-display_width (~> 1.5)
|
|
||||||
unicode_utils (~> 1.4)
|
|
||||||
strings-ansi (0.1.0)
|
|
||||||
test-kitchen (2.3.2)
|
|
||||||
bcrypt_pbkdf (~> 1.0)
|
|
||||||
ed25519 (~> 1.2)
|
|
||||||
license-acceptance (~> 1.0, >= 1.0.11)
|
|
||||||
mixlib-install (~> 3.6)
|
|
||||||
mixlib-shellout (>= 1.2, < 4.0)
|
|
||||||
net-scp (>= 1.1, < 3.0)
|
|
||||||
net-ssh (>= 2.9, < 6.0)
|
|
||||||
net-ssh-gateway (>= 1.2, < 3.0)
|
|
||||||
thor (~> 0.19)
|
|
||||||
winrm (~> 2.0)
|
|
||||||
winrm-elevated (~> 1.0)
|
|
||||||
winrm-fs (~> 1.1)
|
|
||||||
thor (0.20.3)
|
|
||||||
tomlrb (1.2.8)
|
|
||||||
tty-box (0.4.1)
|
|
||||||
pastel (~> 0.7.2)
|
|
||||||
strings (~> 0.1.6)
|
|
||||||
tty-cursor (~> 0.7)
|
|
||||||
tty-color (0.5.0)
|
|
||||||
tty-cursor (0.7.0)
|
|
||||||
tty-prompt (0.19.0)
|
|
||||||
necromancer (~> 0.5.0)
|
|
||||||
pastel (~> 0.7.0)
|
|
||||||
tty-reader (~> 0.6.0)
|
|
||||||
tty-reader (0.6.0)
|
|
||||||
tty-cursor (~> 0.7)
|
|
||||||
tty-screen (~> 0.7)
|
|
||||||
wisper (~> 2.0.0)
|
|
||||||
tty-screen (0.7.0)
|
|
||||||
unicode-display_width (1.6.0)
|
|
||||||
unicode_utils (1.4.0)
|
|
||||||
winrm (2.3.2)
|
|
||||||
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.1)
|
|
||||||
winrm (~> 2.0)
|
|
||||||
winrm-fs (~> 1.0)
|
|
||||||
winrm-fs (1.3.2)
|
|
||||||
erubis (~> 2.7)
|
|
||||||
logging (>= 1.6.1, < 3.0)
|
|
||||||
rubyzip (~> 1.1)
|
|
||||||
winrm (~> 2.0)
|
|
||||||
wisper (2.0.0)
|
|
||||||
|
|
||||||
PLATFORMS
|
|
||||||
ruby
|
|
||||||
|
|
||||||
DEPENDENCIES
|
|
||||||
kitchen-ansible
|
|
||||||
kitchen-docker_cli
|
|
||||||
rubocop (= 0.50.0)
|
|
||||||
test-kitchen
|
|
||||||
|
|
||||||
BUNDLED WITH
|
|
||||||
1.16.6
|
|
21
README.md
21
README.md
|
@ -36,25 +36,12 @@ Install and configure filebeat
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
### Test syntax with yamllint
|
### Test with molecule and docker
|
||||||
|
|
||||||
* install `python` and `python-pip`
|
|
||||||
* install yamllint `pip install yamllint`
|
|
||||||
* run `yamllint .`
|
|
||||||
|
|
||||||
### Test syntax with ansible-lint
|
|
||||||
|
|
||||||
* install `python` and `python-pip`
|
|
||||||
* install yamllint `pip install ansible-lint`
|
|
||||||
* run `ansible-lint .`
|
|
||||||
|
|
||||||
### Tests with docker
|
|
||||||
|
|
||||||
* install [docker](https://docs.docker.com/engine/installation/)
|
* install [docker](https://docs.docker.com/engine/installation/)
|
||||||
* install ruby
|
* install `python3` and `python3-pip`
|
||||||
* install bundler `gem install bundler`
|
* install molecule and dependencies `pip3 install molecule molecule-docker docker ansible-lint pytest-testinfra yamllint`
|
||||||
* install dependencies `bundle install`
|
* run `molecule test`
|
||||||
* run the tests `kitchen test`
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
- name: restart filebeat
|
- name: restart filebeat
|
||||||
systemd:
|
ansible.builtin.service:
|
||||||
name: filebeat
|
name: filebeat
|
||||||
state: restarted
|
state: restarted
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
---
|
---
|
||||||
- hosts: localhost
|
- name: Converge
|
||||||
connection: local
|
hosts: all
|
||||||
|
roles:
|
||||||
|
- ansible-role-filebeat
|
||||||
vars:
|
vars:
|
||||||
filebeat_config:
|
filebeat_config:
|
||||||
filebeat.inputs:
|
filebeat.inputs:
|
||||||
|
@ -12,5 +14,7 @@
|
||||||
path: "/tmp/filebeat"
|
path: "/tmp/filebeat"
|
||||||
filename: filebeat
|
filename: filebeat
|
||||||
|
|
||||||
roles:
|
pre_tasks:
|
||||||
- ansible-role-filebeat
|
- name: update apt cache
|
||||||
|
ansible.builtin.apt:
|
||||||
|
update_cache: true
|
26
molecule/default/molecule.yml
Normal file
26
molecule/default/molecule.yml
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
driver:
|
||||||
|
name: docker
|
||||||
|
platforms:
|
||||||
|
- name: debian10
|
||||||
|
image: nishiki/debian10:molecule
|
||||||
|
privileged: true
|
||||||
|
volumes:
|
||||||
|
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
||||||
|
command: /bin/systemd
|
||||||
|
capabilities:
|
||||||
|
- SYS_ADMIN
|
||||||
|
- name: debian11
|
||||||
|
image: nishiki/debian11:molecule
|
||||||
|
privileged: true
|
||||||
|
volumes:
|
||||||
|
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
||||||
|
command: /bin/systemd
|
||||||
|
capabilities:
|
||||||
|
- SYS_ADMIN
|
||||||
|
lint: |
|
||||||
|
set -e
|
||||||
|
yamllint .
|
||||||
|
ansible-lint .
|
||||||
|
verifier:
|
||||||
|
name: testinfra
|
26
molecule/default/tests/test_default.py
Normal file
26
molecule/default/tests/test_default.py
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
import testinfra.utils.ansible_runner
|
||||||
|
import time
|
||||||
|
|
||||||
|
def test_packages(host):
|
||||||
|
package = host.package('filebeat')
|
||||||
|
assert package.is_installed
|
||||||
|
|
||||||
|
def test_config_file(host):
|
||||||
|
path = host.file('/etc/filebeat/filebeat.yml')
|
||||||
|
assert path.exists
|
||||||
|
assert path.is_file
|
||||||
|
assert path.user == 'root'
|
||||||
|
assert path.group == 'root'
|
||||||
|
assert path.mode == 0o644
|
||||||
|
|
||||||
|
def test_service(host):
|
||||||
|
service = host.service('filebeat')
|
||||||
|
assert service.is_running
|
||||||
|
assert service.is_enabled
|
||||||
|
|
||||||
|
def test_output(host):
|
||||||
|
time.sleep(15)
|
||||||
|
path = host.file('/tmp/filebeat/filebeat')
|
||||||
|
assert path.exists
|
||||||
|
assert path.is_file
|
||||||
|
assert path.contains('@timestamp')
|
|
@ -1,14 +1,15 @@
|
||||||
---
|
---
|
||||||
- name: install dependencies packages
|
- name: install dependencies packages
|
||||||
apt:
|
ansible.builtin.package:
|
||||||
name: apt-transport-https
|
name:
|
||||||
|
- apt-transport-https
|
||||||
retries: 2
|
retries: 2
|
||||||
register: result
|
register: result
|
||||||
until: result is succeeded
|
until: result is succeeded
|
||||||
tags: filebeat
|
tags: filebeat
|
||||||
|
|
||||||
- name: add repository key
|
- name: add repository key
|
||||||
apt_key:
|
ansible.builtin.apt_key:
|
||||||
url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
|
url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
|
||||||
retries: 2
|
retries: 2
|
||||||
register: result
|
register: result
|
||||||
|
@ -16,12 +17,12 @@
|
||||||
tags: filebeat
|
tags: filebeat
|
||||||
|
|
||||||
- name: add repository
|
- name: add repository
|
||||||
apt_repository:
|
ansible.builtin.apt_repository:
|
||||||
repo: 'deb https://artifacts.elastic.co/packages/{{ filebeat_major_version }}.x/apt stable main'
|
repo: 'deb https://artifacts.elastic.co/packages/{{ filebeat_major_version }}.x/apt stable main'
|
||||||
tags: filebeat
|
tags: filebeat
|
||||||
|
|
||||||
- name: install package
|
- name: install package
|
||||||
apt:
|
ansible.builtin.package:
|
||||||
name: filebeat
|
name: filebeat
|
||||||
retries: 2
|
retries: 2
|
||||||
register: result
|
register: result
|
||||||
|
@ -29,7 +30,7 @@
|
||||||
tags: filebeat
|
tags: filebeat
|
||||||
|
|
||||||
- name: copy config file
|
- name: copy config file
|
||||||
copy:
|
ansible.builtin.copy:
|
||||||
content: '{{ filebeat_config|to_yaml }}'
|
content: '{{ filebeat_config|to_yaml }}'
|
||||||
dest: /etc/filebeat/filebeat.yml
|
dest: /etc/filebeat/filebeat.yml
|
||||||
owner: root
|
owner: root
|
||||||
|
@ -39,7 +40,7 @@
|
||||||
tags: filebeat
|
tags: filebeat
|
||||||
|
|
||||||
- name: enable and start service
|
- name: enable and start service
|
||||||
systemd:
|
ansible.builtin.service:
|
||||||
name: filebeat
|
name: filebeat
|
||||||
state: started
|
state: started
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
require 'serverspec'
|
|
||||||
|
|
||||||
set :backend, :exec
|
|
||||||
|
|
||||||
puts
|
|
||||||
puts '================================'
|
|
||||||
puts %x(ansible --version)
|
|
||||||
puts '================================'
|
|
||||||
|
|
||||||
sleep 10
|
|
||||||
|
|
||||||
describe package('filebeat') do
|
|
||||||
it { should be_installed }
|
|
||||||
end
|
|
||||||
|
|
||||||
describe file('/etc/filebeat/filebeat.yml') do
|
|
||||||
it { should be_file }
|
|
||||||
it { should be_mode 644 }
|
|
||||||
it { should be_owned_by 'root' }
|
|
||||||
it { should be_grouped_into 'root' }
|
|
||||||
end
|
|
||||||
|
|
||||||
describe service('filebeat') do
|
|
||||||
it { should be_enabled }
|
|
||||||
it { should be_running.under('systemd') }
|
|
||||||
end
|
|
||||||
|
|
||||||
describe file('/tmp/filebeat/filebeat') do
|
|
||||||
it { should be_file }
|
|
||||||
it { should be_mode 600 }
|
|
||||||
it { should be_owned_by 'root' }
|
|
||||||
it { should be_grouped_into 'root' }
|
|
||||||
it { should contain '@timestamp' }
|
|
||||||
end
|
|
|
@ -1 +0,0 @@
|
||||||
localhost
|
|
Loading…
Reference in a new issue