mirror of
https://github.com/elastic/logstash.git
synced 2025-06-27 17:08:55 -04:00
PR#15900 missed a few more places where Logstash is installed but a working minimal pipeline config is added. This commit fixes that and stabilizes all acceptance tests, thus minizing the need for time consuming BK retries of corresponding steps. Relates #15900 Relates https://github.com/elastic/logstash/issues/15784
This commit is contained in:
parent
eedccea33f
commit
54f73e5d22
11 changed files with 14 additions and 0 deletions
|
@ -22,6 +22,7 @@ describe "artifacts composition" do
|
||||||
|
|
||||||
before(:each) do
|
before(:each) do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after(:each) do
|
after(:each) do
|
||||||
|
|
|
@ -22,6 +22,7 @@ require "fileutils"
|
||||||
shared_examples "logstash generate" do |logstash|
|
shared_examples "logstash generate" do |logstash|
|
||||||
before(:each) do
|
before(:each) do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after(:each) do
|
after(:each) do
|
||||||
|
|
|
@ -22,6 +22,7 @@ require "fileutils"
|
||||||
shared_examples "logstash install" do |logstash|
|
shared_examples "logstash install" do |logstash|
|
||||||
before(:each) do
|
before(:each) do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after(:each) do
|
after(:each) do
|
||||||
|
|
|
@ -24,6 +24,7 @@ shared_examples "integration plugins compatible" do |logstash|
|
||||||
let(:plugin) { "logstash-integration-rabbitmq" }
|
let(:plugin) { "logstash-integration-rabbitmq" }
|
||||||
before :each do
|
before :each do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after :each do
|
after :each do
|
||||||
|
@ -60,6 +61,7 @@ shared_examples "integration plugins compatible" do |logstash|
|
||||||
let(:plugin) { "logstash-integration-rabbitmq" }
|
let(:plugin) { "logstash-integration-rabbitmq" }
|
||||||
before :each do
|
before :each do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after :each do
|
after :each do
|
||||||
|
@ -83,6 +85,7 @@ shared_examples "integration plugins compatible" do |logstash|
|
||||||
let(:plugin) { "logstash-integration-rabbitmq" }
|
let(:plugin) { "logstash-integration-rabbitmq" }
|
||||||
before :each do
|
before :each do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after :each do
|
after :each do
|
||||||
|
|
|
@ -23,6 +23,7 @@ shared_examples "logstash list" do |logstash|
|
||||||
describe "logstash-plugin list on [#{logstash.human_name}]" do
|
describe "logstash-plugin list on [#{logstash.human_name}]" do
|
||||||
before(:all) do
|
before(:all) do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after(:all) do
|
after(:all) do
|
||||||
|
|
|
@ -23,6 +23,7 @@ shared_examples "logstash remove" do |logstash|
|
||||||
describe "logstash-plugin remove on [#{logstash.human_name}]" do
|
describe "logstash-plugin remove on [#{logstash.human_name}]" do
|
||||||
before :each do
|
before :each do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after :each do
|
after :each do
|
||||||
|
|
|
@ -23,6 +23,7 @@ shared_examples "logstash uninstall" do |logstash|
|
||||||
describe "logstash-plugin uninstall on [#{logstash.human_name}]" do
|
describe "logstash-plugin uninstall on [#{logstash.human_name}]" do
|
||||||
before :each do
|
before :each do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after :each do
|
after :each do
|
||||||
|
|
|
@ -22,6 +22,7 @@ shared_examples "logstash update" do |logstash|
|
||||||
describe "logstash-plugin update on [#{logstash.human_name}]" do
|
describe "logstash-plugin update on [#{logstash.human_name}]" do
|
||||||
before :each do
|
before :each do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after :each do
|
after :each do
|
||||||
|
|
|
@ -22,6 +22,7 @@ shared_examples "logstash version" do |logstash|
|
||||||
describe "logstash --version" do
|
describe "logstash --version" do
|
||||||
before :all do
|
before :all do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
after :all do
|
after :all do
|
||||||
|
|
|
@ -22,6 +22,7 @@ require 'logstash/version'
|
||||||
RSpec.shared_examples "runnable" do |logstash|
|
RSpec.shared_examples "runnable" do |logstash|
|
||||||
before(:each) do
|
before(:each) do
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
it "is running on [#{logstash.human_name}]" do
|
it "is running on [#{logstash.human_name}]" do
|
||||||
|
|
|
@ -37,12 +37,14 @@ RSpec.shared_examples "updated" do |logstash, from_release_branch|
|
||||||
logstash.download(url, dest)
|
logstash.download(url, dest)
|
||||||
options = {:version => latest_logstash_release_version, :snapshot => false, :base => "./", :skip_jdk_infix => false }
|
options = {:version => latest_logstash_release_version, :snapshot => false, :base => "./", :skip_jdk_infix => false }
|
||||||
logstash.install(options)
|
logstash.install(options)
|
||||||
|
logstash.write_default_pipeline
|
||||||
end
|
end
|
||||||
|
|
||||||
it "can be updated and run on [#{logstash.human_name}]" do
|
it "can be updated and run on [#{logstash.human_name}]" do
|
||||||
expect(logstash).to be_installed
|
expect(logstash).to be_installed
|
||||||
# Performing the update
|
# Performing the update
|
||||||
logstash.install({:version => LOGSTASH_VERSION})
|
logstash.install({:version => LOGSTASH_VERSION})
|
||||||
|
logstash.write_default_pipeline
|
||||||
expect(logstash).to be_installed
|
expect(logstash).to be_installed
|
||||||
# starts the service to be sure it runs after the upgrade
|
# starts the service to be sure it runs after the upgrade
|
||||||
with_running_logstash_service(logstash) do
|
with_running_logstash_service(logstash) do
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue