Skip to content

Commit

Permalink
Follow up to elastic#15900 -- fix remaining acceptance tests (elastic…
Browse files Browse the repository at this point in the history
…#15907)

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 elastic#15900
Relates elastic#15784
  • Loading branch information
dliappis authored Feb 15, 2024
1 parent eedccea commit 54f73e5
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions qa/acceptance/spec/lib/artifact_composition_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

before(:each) do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after(:each) do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
shared_examples "logstash generate" do |logstash|
before(:each) do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after(:each) do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
shared_examples "logstash install" do |logstash|
before(:each) do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after(:each) do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
let(:plugin) { "logstash-integration-rabbitmq" }
before :each do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after :each do
Expand Down Expand Up @@ -60,6 +61,7 @@
let(:plugin) { "logstash-integration-rabbitmq" }
before :each do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after :each do
Expand All @@ -83,6 +85,7 @@
let(:plugin) { "logstash-integration-rabbitmq" }
before :each do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after :each do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
describe "logstash-plugin list on [#{logstash.human_name}]" do
before(:all) do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after(:all) do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
describe "logstash-plugin remove on [#{logstash.human_name}]" do
before :each do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after :each do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
describe "logstash-plugin uninstall on [#{logstash.human_name}]" do
before :each do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after :each do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
describe "logstash-plugin update on [#{logstash.human_name}]" do
before :each do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after :each do
Expand Down
1 change: 1 addition & 0 deletions qa/acceptance/spec/shared_examples/cli/logstash/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
describe "logstash --version" do
before :all do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

after :all do
Expand Down
1 change: 1 addition & 0 deletions qa/acceptance/spec/shared_examples/running.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
RSpec.shared_examples "runnable" do |logstash|
before(:each) do
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
end

it "is running on [#{logstash.human_name}]" do
Expand Down
2 changes: 2 additions & 0 deletions qa/acceptance/spec/shared_examples/updated.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@
logstash.download(url, dest)
options = {:version => latest_logstash_release_version, :snapshot => false, :base => "./", :skip_jdk_infix => false }
logstash.install(options)
logstash.write_default_pipeline
end

it "can be updated and run on [#{logstash.human_name}]" do
expect(logstash).to be_installed
# Performing the update
logstash.install({:version => LOGSTASH_VERSION})
logstash.write_default_pipeline
expect(logstash).to be_installed
# starts the service to be sure it runs after the upgrade
with_running_logstash_service(logstash) do
Expand Down

0 comments on commit 54f73e5

Please sign in to comment.