[Build] Tidy up, and fix secure integration tests

Adds a DISTRIBUTION environment variable, which can be:
  legacy: OSS < 6.3
  legacyxpack: < 6.3 with xpack plugin
  oss: OSS >= 6.3
  default: standard distribution >= 6.3

Removes the exclusion filter for `secure_integration` - this was stopping
  secure integration tests from running even with tags on
Updates logstash branch to 6.4

Author: robbavey

.travis.yml

@@ -4,14 +4,14 @@ language: ruby
 cache: bundler
 env:
 - INTEGRATION=false
-- INTEGRATION=true ES_VERSION=1.7.6 TEST_DEBUG=true
-- INTEGRATION=true ES_VERSION=2.4.4 TEST_DEBUG=true
-- INTEGRATION=true ES_VERSION=5.6.9 TEST_DEBUG=true
-- OSS=true INTEGRATION=true ES_VERSION=6.4.2 TEST_DEBUG=true
-- OSS=false INTEGRATION=true ES_VERSION=6.4.2 TEST_DEBUG=true
-- INTEGRATION=true ES_VERSION=master TEST_DEBUG=true
-- SECURE_INTEGRATION=true INTEGRATION=true ES_VERSION=5.6.9 TEST_DEBUG=true
-- OSS=false SECURE_INTEGRATION=true INTEGRATION=true ES_VERSION=6.4.2 TEST_DEBUG=true
+- DISTRIBUTION=legacy INTEGRATION=true ES_VERSION=1.7.6 TEST_DEBUG=true
+- DISTRIBUTION=legacy INTEGRATION=true ES_VERSION=2.4.4 TEST_DEBUG=true
+- DISTRIBUTION=legacy INTEGRATION=true ES_VERSION=5.6.9 TEST_DEBUG=true
+- DISTRIBUTION=oss INTEGRATION=true ES_VERSION=6.4.2 TEST_DEBUG=true
+- DISTRIBUTION=default INTEGRATION=true ES_VERSION=6.4.2 TEST_DEBUG=true
+- DISTRIBUTION=default INTEGRATION=true ES_VERSION=master TEST_DEBUG=true
+- DISTRIBUTION=legacyxpack SECURE_INTEGRATION=true INTEGRATION=true ES_VERSION=5.6.9 TEST_DEBUG=true
+- DISTRIBUTION=default SECURE_INTEGRATION=true INTEGRATION=true ES_VERSION=6.4.2 TEST_DEBUG=true
 
 rvm:
 - jruby-1.7.25
@@ -22,11 +22,11 @@ matrix:
   - rvm: jruby-9.1.13.0
     env: LOGSTASH_BRANCH=6.x
   - rvm: jruby-9.1.13.0
-    env: LOGSTASH_BRANCH=6.2
+    env: LOGSTASH_BRANCH=6.4
   - rvm: jruby-1.7.27
     env: LOGSTASH_BRANCH=5.6
   allow_failures:
-  - env: INTEGRATION=true ES_VERSION=master TEST_DEBUG=true
+  - env: DISTRIBUTION=default INTEGRATION=true ES_VERSION=master TEST_DEBUG=true
   fast_finish: true
 install: true
 script: ci/build.sh

ci/run.sh

@@ -32,15 +32,16 @@ setup_es() {
   # If we're running with xpack SSL/Users enabled...
   # Note that 6.3.0 releases and above do not require an x-pack plugin install
 
-  if [[ "$SECURE_INTEGRATION" == "true" ]]; then
-    if [[ -z "$OSS" ]]; then
-        if [[ "$xpack_download_url" == "" ]]; then
-          yes y | elasticsearch/bin/elasticsearch-plugin install x-pack
-        else
-          curl -sL $xpack_download_url > elasticsearch/xpack.zip
-          yes y | elasticsearch/bin/elasticsearch-plugin install file://$BUILD_DIR/elasticsearch/xpack.zip
-        fi
+  if [[ "$DISTRIBUTION" == "legacyxpack" ]]; then
+    if [[ "$xpack_download_url" == "" ]]; then
+      yes y | elasticsearch/bin/elasticsearch-plugin install x-pack
+    else
+      curl -sL $xpack_download_url > elasticsearch/xpack.zip
+      yes y | elasticsearch/bin/elasticsearch-plugin install file://$BUILD_DIR/elasticsearch/xpack.zip
     fi
+  fi
+
+  if [[ "$SECURE_INTEGRATION" == "true" ]]; then
     es_yml=elasticsearch/config/elasticsearch.yml
     cp -rv $BUILD_DIR/spec/fixtures/test_certs elasticsearch/config/test_certs
     echo "xpack.security.http.ssl.enabled: true" >> $es_yml
@@ -58,18 +59,17 @@ start_es() {
   es_url="http://localhost:9200"
   if [[ "$SECURE_INTEGRATION" == "true" ]]; then
     es_url="https://localhost:9200 -k"
-
-    # Needed for travis. On travis the `users` script will fail because it will first try and write
-    # to /etc/elasticsearch
-    export CONF_DIR=$BUILD_DIR/elasticsearch/config
-
-    if [[ "$OSS" == "false" ]]; then
-        elasticsearch/bin/elasticsearch-users useradd simpleuser -p abc123 -r superuser
-        elasticsearch/bin/elasticsearch-users useradd 'f@ncyuser' -p 'ab%12#' -r superuser
-    else
-        elasticsearch/bin/x-pack/users useradd simpleuser -p abc123 -r superuser
-        elasticsearch/bin/x-pack/users useradd 'f@ncyuser' -p 'ab%12#' -r superuser
-    fi
+  fi
+  # Needed for travis. On travis the `users` script will fail because it will first try and write
+  # to /etc/elasticsearch
+  export CONF_DIR=$BUILD_DIR/elasticsearch/config
+
+  if [[ "$DISTRIBUTION" == "default" ]]; then
+      elasticsearch/bin/elasticsearch-users useradd simpleuser -p abc123 -r superuser
+      elasticsearch/bin/elasticsearch-users useradd 'f@ncyuser' -p 'ab%12#' -r superuser
+  elif [[ "$DISTRIBUTION" == "legacyxpack" ]]; then
+      elasticsearch/bin/x-pack/users useradd simpleuser -p abc123 -r superuser
+      elasticsearch/bin/x-pack/users useradd 'f@ncyuser' -p 'ab%12#' -r superuser
   fi
 
   while ! curl --silent $es_url && [[ $count -ne 0 ]]; do
@@ -139,9 +139,9 @@ else
       bundle exec rspec -fd $extra_tag_args --tag update_tests:painless --tag update_tests:groovy --tag es_version:$es_distribution_version $spec_path
       ;;
     6.*)
-      if [[ "$OSS" == "true" ]]; then
+      if [[ "$DISTRIBUTION" == "oss" ]]; then
         setup_es https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz
-      else
+      elif [[ "$DISTRIBUTION" == "default" ]]; then
         setup_es https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
       fi
       es_distribution_version=$(get_es_distribution_version)

spec/es_spec_helper.rb

@@ -2,12 +2,6 @@
 require 'manticore'
 require 'elasticsearch'
 
-# by default exclude secure_integration tests unless requested
-# normal integration specs are already excluded by devutils' spec helper
-RSpec.configure do |config|
-   config.filter_run_excluding config.exclusion_filter.add(:secure_integration => true)
-end
-
 module ESHelper
   def get_host_port
     "127.0.0.1:9200"