From 1afd1fcf6c84b17db4ce914b8157b27f45113c8c Mon Sep 17 00:00:00 2001 From: Adrien Waksberg Date: Fri, 8 Apr 2022 09:02:40 +0200 Subject: [PATCH] test: replace kitchen to molecule --- .gitignore | 1 + CHANGELOG.md | 4 + Gemfile | 8 -- Gemfile.lock | 130 ------------------ README.md | 21 +-- handlers/main.yml | 2 +- .../default/converge.yml | 12 +- molecule/default/molecule.yml | 26 ++++ molecule/default/tests/test_default.py | 26 ++++ tasks/main.yml | 15 +- .../default/serverspec/default_spec.rb | 34 ----- test/integration/inventory | 1 - 12 files changed, 78 insertions(+), 202 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock rename test/integration/default/default.yml => molecule/default/converge.yml (68%) create mode 100644 molecule/default/molecule.yml create mode 100644 molecule/default/tests/test_default.py delete mode 100644 test/integration/default/serverspec/default_spec.rb delete mode 100644 test/integration/inventory diff --git a/.gitignore b/.gitignore index 79776e8..1331d18 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .kitchen/* +*.pyc diff --git a/CHANGELOG.md b/CHANGELOG.md index bb66a74..c12ec1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) ## [Unreleased] +### Changed + +- test: replace kitchen to molecule + ## v1.0.0 - 2019-11-09 ### Added diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 0d96441..0000000 --- a/Gemfile +++ /dev/null @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index a7102f1..0000000 --- a/Gemfile.lock +++ /dev/null @@ -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 diff --git a/README.md b/README.md index 2244f6a..679db05 100644 --- a/README.md +++ b/README.md @@ -36,25 +36,12 @@ Install and configure filebeat ## Development -### Test syntax with yamllint - -* 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 +### Test with molecule and docker * install [docker](https://docs.docker.com/engine/installation/) -* install ruby -* install bundler `gem install bundler` -* install dependencies `bundle install` -* run the tests `kitchen test` +* install `python3` and `python3-pip` +* install molecule and dependencies `pip3 install molecule molecule-docker docker ansible-lint pytest-testinfra yamllint` +* run `molecule test` ## License diff --git a/handlers/main.yml b/handlers/main.yml index eafda40..5c051de 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,5 +1,5 @@ --- - name: restart filebeat - systemd: + ansible.builtin.service: name: filebeat state: restarted diff --git a/test/integration/default/default.yml b/molecule/default/converge.yml similarity index 68% rename from test/integration/default/default.yml rename to molecule/default/converge.yml index e27c426..0014775 100644 --- a/test/integration/default/default.yml +++ b/molecule/default/converge.yml @@ -1,6 +1,8 @@ --- -- hosts: localhost - connection: local +- name: Converge + hosts: all + roles: + - ansible-role-filebeat vars: filebeat_config: filebeat.inputs: @@ -12,5 +14,7 @@ path: "/tmp/filebeat" filename: filebeat - roles: - - ansible-role-filebeat + pre_tasks: + - name: update apt cache + ansible.builtin.apt: + update_cache: true diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml new file mode 100644 index 0000000..0507c53 --- /dev/null +++ b/molecule/default/molecule.yml @@ -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 diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py new file mode 100644 index 0000000..21c1fbf --- /dev/null +++ b/molecule/default/tests/test_default.py @@ -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') diff --git a/tasks/main.yml b/tasks/main.yml index c4ceed2..8811a8e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,14 +1,15 @@ --- - name: install dependencies packages - apt: - name: apt-transport-https + ansible.builtin.package: + name: + - apt-transport-https retries: 2 register: result until: result is succeeded tags: filebeat - name: add repository key - apt_key: + ansible.builtin.apt_key: url: https://artifacts.elastic.co/GPG-KEY-elasticsearch retries: 2 register: result @@ -16,12 +17,12 @@ tags: filebeat - name: add repository - apt_repository: + ansible.builtin.apt_repository: repo: 'deb https://artifacts.elastic.co/packages/{{ filebeat_major_version }}.x/apt stable main' tags: filebeat - name: install package - apt: + ansible.builtin.package: name: filebeat retries: 2 register: result @@ -29,7 +30,7 @@ tags: filebeat - name: copy config file - copy: + ansible.builtin.copy: content: '{{ filebeat_config|to_yaml }}' dest: /etc/filebeat/filebeat.yml owner: root @@ -39,7 +40,7 @@ tags: filebeat - name: enable and start service - systemd: + ansible.builtin.service: name: filebeat state: started enabled: true diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb deleted file mode 100644 index 6686af2..0000000 --- a/test/integration/default/serverspec/default_spec.rb +++ /dev/null @@ -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 diff --git a/test/integration/inventory b/test/integration/inventory deleted file mode 100644 index 2fbb50c..0000000 --- a/test/integration/inventory +++ /dev/null @@ -1 +0,0 @@ -localhost