diff --git a/.gitignore b/.gitignore index 79776e8..1331d18 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .kitchen/* +*.pyc diff --git a/.kitchen.yml b/.kitchen.yml deleted file mode 100644 index 3cdce5f..0000000 --- a/.kitchen.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -driver: - name: docker_cli - -transport: - name: docker_cli - -provisioner: - name: ansible_playbook - hosts: localhost - require_ansible_repo: false - require_ansible_omnibus: false - require_chef_for_busser: true - ansible_verbose: false - ansible_inventory: ./test/integration/inventory - -platforms: - - name: debian-10 - driver_config: - image: "nishiki/debian10:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.9' %>" - command: /bin/systemd - volume: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - privileged: cap-add=SYS_ADMIN - -suites: - - name: default diff --git a/CHANGELOG.md b/CHANGELOG.md index 3995d27..a5a5ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) ## [Unreleased] +### Changed + +- replace kitchen to molecule + ## v1.1.0 - 2019-11-21 ### 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 d2c6932..92a55e0 100644 --- a/README.md +++ b/README.md @@ -47,25 +47,12 @@ Install and configure Elasticsearch ## 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]' ansible-lint testinfra yamllint` +* run `molecule test` ## License diff --git a/test/integration/default/default.yml b/molecule/default/converge.yml similarity index 66% rename from test/integration/default/default.yml rename to molecule/default/converge.yml index 986bd4d..a098a8b 100644 --- a/test/integration/default/default.yml +++ b/molecule/default/converge.yml @@ -1,6 +1,6 @@ --- -- hosts: localhost - connection: local +- name: Converge + hosts: all vars: elasticsearch_heap_size: 512m elasticsearch_index_templates: @@ -13,6 +13,10 @@ mappings: metrics: type: short - roles: - ansible-role-elasticsearch +# +# tasks: +# - name: "Include ansible-role-elasticsearch" +# include_role: +# name: "ansible-role-elasticsearch" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml new file mode 100644 index 0000000..cd99616 --- /dev/null +++ b/molecule/default/molecule.yml @@ -0,0 +1,18 @@ +--- +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 +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..c12dc7c --- /dev/null +++ b/molecule/default/tests/test_default.py @@ -0,0 +1,32 @@ +import os +import testinfra.utils.ansible_runner + +def test_packages(host): + package = host.package('elasticsearch') + assert package.is_installed + +def test_config_file(host): + config = host.file('/etc/elasticsearch/elasticsearch.yml') + assert config.user == 'root' + assert config.group == 'elasticsearch' + assert config.mode == 0o640 + assert config.contains('path.data: /var/lib/elasticsearch') + +def test_service(host): + service = host.service('elasticsearch') + assert service.is_running + assert service.is_enabled + +def test_socket(host): + for port in [9200, 9300]: + socket = host.socket('tcp://127.0.0.1:%d' % (port)) + assert socket.is_listening + +def test_java_memory(host): + process = host.process.get(user='elasticsearch', comm='java') + assert '-Xms512m' in process.args + assert '-Xmx512m' in process.args + +def test_elasticsearch_template(host): + result = host.check_output('curl -v http://127.0.0.1:9200/_template/test') + assert '"number_of_replicas":"1"' in result diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb deleted file mode 100644 index ca299df..0000000 --- a/test/integration/default/serverspec/default_spec.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'serverspec' - -set :backend, :exec - -puts -puts '================================' -puts %x(ansible --version) -puts '================================' - -sleep 10 - -describe package('elasticsearch') do - it { should be_installed } -end - -describe file('/etc/elasticsearch/elasticsearch.yml') do - it { should be_file } - it { should be_mode 640 } - it { should be_owned_by 'root' } - it { should be_grouped_into 'elasticsearch' } - it { should contain 'path.data: /var/lib/elasticsearch' } -end - -describe service('elasticsearch') do - it { should be_enabled } - it { should be_running.under('systemd') } -end - -describe port(9200) do - it { should be_listening } -end - -describe command('systemctl status elasticsearch') do - its(:stdout) { should contain('-Xms512m -Xmx512m') } -end - -describe command('curl -v http://127.0.0.1:9200/_template/test') do - its(:exit_status) { should eq 0 } - its(:stdout) { should contain('"number_of_replicas":"1"') } -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