Rollback from trusty. Not adding anything at this point.

This commit is contained in:
Karl Southern 2016-06-29 21:25:05 +01:00
parent 53eaee001d
commit 6c852d21dc
2 changed files with 3 additions and 7 deletions

View File

@ -1,14 +1,10 @@
sudo: required sudo: required
dist: trusty
language: ruby language: ruby
cache: bundler cache: bundler
rvm: rvm:
- jruby-1.7.25 - jruby-1.7.25
jdk: jdk:
- oraclejdk8 - oraclejdk8
before_install:
- export JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false'
- gem install bundler
before_script: before_script:
- bundle exec rake vendor - bundle exec rake vendor
- bundle exec rake install_jars - bundle exec rake install_jars

View File

@ -3,7 +3,6 @@ require 'logstash/outputs/jdbc'
require 'stud/temporary' require 'stud/temporary'
require 'java' require 'java'
require 'securerandom' require 'securerandom'
require 'mkmf'
RSpec.shared_context 'rspec setup' do RSpec.shared_context 'rspec setup' do
it 'ensure jar is available' do it 'ensure jar is available' do
@ -110,9 +109,10 @@ RSpec.shared_context 'when outputting messages' do
# Start a thread to stop and restart the service. # Start a thread to stop and restart the service.
t = Thread.new(systemd_database_service) { |systemd_database_service| t = Thread.new(systemd_database_service) { |systemd_database_service|
start_stop_cmd = 'sudo /etc/init.d/%<service>s %<action>s' start_stop_cmd = 'sudo /etc/init.d/%<service>s* %<action>s'
if find_executable('systemctl') `which systemctl`
if $?.success?
start_stop_cmd = 'sudo systemctl %<action>s %<service>s' start_stop_cmd = 'sudo systemctl %<action>s %<service>s'
end end