diff --git a/.kitchen.yml b/.kitchen.yml index 7165476..0284b0b 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -20,7 +20,6 @@ platforms: privileged: true provision_command: - apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:ansible/ansible - - apt-get install -y -q net-tools - apt-get update && apt-get -y -q install python-apt python-pycurl use_sudo: false volume: <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json @@ -75,7 +74,8 @@ suites: attributes: extra_vars: es_plugins: - - plugin: mapper-murmur3 + - plugin: lmenezes/elasticsearch-kopf + version: master provisioner: playbook: test/integration/package.yml - name: config-2x @@ -88,7 +88,8 @@ suites: attributes: extra_vars: es_plugins: - - plugin: mapper-murmur3 + - plugin: lmenezes/elasticsearch-kopf + version: master provisioner: playbook: test/integration/multi.yml - name: xpack-2x diff --git a/tasks/java.yml b/tasks/java.yml index ed7247f..ed49fb1 100644 --- a/tasks/java.yml +++ b/tasks/java.yml @@ -12,4 +12,11 @@ - name: Debian - Ensure Java is installed apt: name={{ java }} state={{java_state}} update_cache=yes force=yes - when: ansible_os_family == 'Debian' \ No newline at end of file + when: ansible_os_family == 'Debian' + +- command: java -version 2>&1 | grep OpenJDK + register: open_jdk + +- name: refresh the java ca-certificates + command: /var/lib/dpkg/info/ca-certificates-java.postinst configure + when: ansible_distribution == 'Ubuntu' and open_jdk.rc == 0 \ No newline at end of file diff --git a/test/integration/helpers/serverspec/xpack_spec.rb b/test/integration/helpers/serverspec/xpack_spec.rb index 14cd42d..2bc671d 100644 --- a/test/integration/helpers/serverspec/xpack_spec.rb +++ b/test/integration/helpers/serverspec/xpack_spec.rb @@ -120,12 +120,12 @@ shared_examples 'xpack::init' do |es_version| its(:exit_status) { should eq 0 } end - describe file('/usr/share/elasticsearch/plugins/mapper-murmur3') do + describe file('/usr/share/elasticsearch/plugins/kopf') do it { should be_directory } it { should be_owned_by 'elasticsearch' } end - describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep mapper-murmur3') do + describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep kopf') do its(:exit_status) { should eq 0 } end diff --git a/test/integration/multi-2x/serverspec/default_spec.rb b/test/integration/multi-2x/serverspec/default_spec.rb index 703ad1a..81637c4 100644 --- a/test/integration/multi-2x/serverspec/default_spec.rb +++ b/test/integration/multi-2x/serverspec/default_spec.rb @@ -2,7 +2,7 @@ require 'multi_spec' describe 'Multi Tests v 2.x' do - include_examples 'multi::init', "2.3.4", ["mapper-murmur3"] + include_examples 'multi::init', "2.3.4", ["kopf"] end diff --git a/test/integration/package-2x/serverspec/default_spec.rb b/test/integration/package-2x/serverspec/default_spec.rb index 4cb829c..417df47 100644 --- a/test/integration/package-2x/serverspec/default_spec.rb +++ b/test/integration/package-2x/serverspec/default_spec.rb @@ -2,5 +2,5 @@ require 'package_spec' describe 'Package Tests v 2.x' do - include_examples 'package::init', "2.3.4", ["mapper-murmur3"] + include_examples 'package::init', "2.3.4", ["kopf"] end \ No newline at end of file diff --git a/test/integration/xpack.yml b/test/integration/xpack.yml index 2c098bb..25ece50 100644 --- a/test/integration/xpack.yml +++ b/test/integration/xpack.yml @@ -10,7 +10,8 @@ es_enable_xpack: true es_xpack_license: "{{ lookup('file', '/tmp/license.json') }}" es_plugins: - - plugin: mapper-murmur3 + - plugin: lmenezes/elasticsearch-kopf + version: master es_xpack_features: - shield - watcher