Skip to content

Commit

Permalink
Allow to run acceptance test with the local logstash
Browse files Browse the repository at this point in the history
This change introduce a new command ci/ci_acceptance which is
responsable of building the packages, bootstraping the acceptance test
environement, launching the VMs and running the tests.

This PR also add a new rake task to build all the artifacts in a single
run called rake artifact:all it make sure we only install the plugin
only once and make the build process faster.

Fixes: elastic#5212
k
  • Loading branch information
ph committed Apr 28, 2016
1 parent ad07bc4 commit 8f912db
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 39 deletions.
19 changes: 19 additions & 0 deletions ci/ci_acceptance.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh
set -e

echo "Building Logstash artifacts"
rake artifact:all

echo "Acceptance: Copying package to the shared folders"
rm -rf qa/packages
mkdir -p qa/packages

echo "Acceptance: Installing dependencies"
cd qa
bundle install

echo "Acceptance: Running the tests"
bundle exec rake test:setup
bundle exec rake test:ssh_config
bundle exec rake test:acceptance:all
cd ..
5 changes: 5 additions & 0 deletions qa/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ follow to setup your environment.

### Environment setup and Running Tests

It is possible to run the full suite of the acceptance test with the codebase by
running the command `ci/ci_acceptance.sh`, this command will generate the artefacts, bootstrap
the VM and run the tests.


This test are based on a collection of Vagrant defined VM's where the
different test are going to be executed, so first setup necessary is to
have vagrant properly available, see https://www.vagrantup.com/ for
Expand Down
2 changes: 1 addition & 1 deletion qa/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace :test do
require "json"
raw_ssh_config = LogStash::VagrantHelpers.fetch_config.stdout.split("\n");
parsed_ssh_config = LogStash::VagrantHelpers.parse(raw_ssh_config)
File.write(".vm_ssh_config", parsed_ssh_config.to_json)
File.write(File.join(File.dirname(__FILE__), ".vm_ssh_config"), parsed_ssh_config.to_json)
end

desc "Bootstrap all the VM's used for this tests"
Expand Down
7 changes: 1 addition & 6 deletions qa/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,11 @@ Vagrant.configure(2) do |config|
v.memory = 2096
v.cpus = 4
end
machine.vm.synced_folder "../../build", "/logstash-build", create: true
machine.vm.synced_folder "../build", "/logstash-build", create: true
machine.vm.provision :shell do |sh|
sh.path = "sys/#{platform.type}/bootstrap.sh"
sh.privileged = true
end

machine.vm.provision :shell do |sh|
sh.path = "sys/#{platform.type}/user_bootstrap.sh"
sh.privileged = false
end
end
end
end
6 changes: 3 additions & 3 deletions qa/acceptance/spec/centos/lib/install_spec.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# encoding: utf-8
require_relative '../spec_helper'
require 'logstash/version'
require_relative "../spec_helper"
require "logstash/version"

describe "artifacts", :platform => :centos do

shared_examples "installable" do |host, name|

before(:each) do
install("/home/vagrant/logstash-latest-SNAPSHOT.rpm", host)
install("/logstash-build/logstash-#{LOGSTASH_VERSION}.noarch.rpm", host)
end

it "is installed on #{name}" do
Expand Down
4 changes: 2 additions & 2 deletions qa/acceptance/spec/config_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ def self.find_selected_boxes(default_boxes=[])
end

def self.configure(vagrant_boxes)
setup_config = JSON.parse(File.read(".vm_ssh_config"))
setup_config = JSON.parse(File.read(File.join(File.dirname(__FILE__), "..", "..", ".vm_ssh_config")))

ServiceTester.configure do |config|
config.servers = []
config.lookup = {}
Expand All @@ -24,5 +25,4 @@ def self.configure(vagrant_boxes)
end
end
end

end
6 changes: 3 additions & 3 deletions qa/acceptance/spec/debian/lib/install_spec.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# encoding: utf-8
require_relative '../spec_helper'
require 'logstash/version'
require_relative "../spec_helper"
require "logstash/version"

describe "artifacts", :platform => :debian do

shared_examples "installable" do |host, name|

before(:each) do
install("/home/vagrant/logstash-latest-SNAPSHOT.deb", host)
install("/logstash-build/logstash-#{LOGSTASH_VERSION}_all.deb", host)
end

it "is installed on #{name}" do
Expand Down
8 changes: 0 additions & 8 deletions qa/sys/centos/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,3 @@

yum update
yum install -y java-1.8.0-openjdk-devel.x86_64

##
# Install logstash manually from a URL
##
BRANCH=${LOGSTASH_BRANCH:-'master'}
BUILD_URL='https://s3-eu-west-1.amazonaws.com/build-eu.elasticsearch.org/logstash'
URL="$BUILD_URL/$BRANCH/nightly/JDK8/logstash-latest-SNAPSHOT.rpm"
wget --no-verbose $URL
4 changes: 0 additions & 4 deletions qa/sys/centos/user_bootstrap.sh

This file was deleted.

8 changes: 0 additions & 8 deletions qa/sys/debian/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,3 @@

apt-get update
apt-get install -y openjdk-7-jdk

##
# Install logstash manually from a URL
##
BRANCH=${LOGSTASH_BRANCH:-'master'}
BUILD_URL='https://s3-eu-west-1.amazonaws.com/build-eu.elasticsearch.org/logstash'
URL="$BUILD_URL/$BRANCH/nightly/JDK8/logstash-latest-SNAPSHOT.deb"
wget --no-verbose $URL
4 changes: 0 additions & 4 deletions qa/sys/debian/user_bootstrap.sh

This file was deleted.

15 changes: 15 additions & 0 deletions rakelib/artifacts.rake
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,20 @@ namespace "artifact" do
end.flatten.uniq
end

task "all" => ["prepare"] do
Rake::Task["artifact:deb"].invoke
Rake::Task["artifact:rpm"].invoke
Rake::Task["artifact:zip"].invoke
Rake::Task["artifact:tar"].invoke
end

task "all-all-plugins" => ["prepare-all"] do
Rake::Task["artifact:deb"].invoke
Rake::Task["artifact:rpm"].invoke
Rake::Task["artifact:zip"].invoke
Rake::Task["artifact:tar"].invoke
end

# We create an empty bundle config file
# This will allow the deb and rpm to create a file
# with the correct user group and permission.
Expand Down Expand Up @@ -120,6 +134,7 @@ namespace "artifact" do
end

task "prepare" => ["bootstrap", "plugin:install-default", "install-logstash-core", "install-logstash-core-event", "install-logstash-core-plugin-api", "clean-bundle-config"]

task "prepare-all" => ["bootstrap", "plugin:install-all", "install-logstash-core", "install-logstash-core-event", "install-logstash-core-plugin-api", "clean-bundle-config"]

desc "Build a tar.gz of default logstash plugins with all dependencies"
Expand Down

0 comments on commit 8f912db

Please sign in to comment.