Tests back to kopf + checks to fix java cert issues

This commit is contained in:
Dale McDiarmid 2017-01-05 14:34:47 +00:00
parent cad6a590f9
commit 5fb4350a63
6 changed files with 18 additions and 9 deletions

View file

@ -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

View file

@ -13,3 +13,10 @@
- name: Debian - Ensure Java is installed
apt: name={{ java }} state={{java_state}} update_cache=yes force=yes
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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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