From 038e8e9d5c30695fba85cb734606ee6de2e802a8 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Thu, 21 Sep 2017 16:55:57 -0500 Subject: [PATCH] Remove Travis builds (they have been replaced by Jenkins) Fixes: #8079 Fixes #8362 --- .travis.yml | 30 ----------------- ci/ci_acceptance.sh | 56 -------------------------------- ci/ci_integration.sh | 24 -------------- ci/ci_setup.sh | 28 ---------------- ci/ci_test.bat | 35 -------------------- ci/ci_test.sh | 24 -------------- ci/travis_integration_install.sh | 26 --------------- ci/travis_integration_run.sh | 16 --------- 8 files changed, 239 deletions(-) delete mode 100644 .travis.yml delete mode 100755 ci/ci_acceptance.sh delete mode 100755 ci/ci_integration.sh delete mode 100755 ci/ci_setup.sh delete mode 100644 ci/ci_test.bat delete mode 100755 ci/ci_test.sh delete mode 100755 ci/travis_integration_install.sh delete mode 100755 ci/travis_integration_run.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a47acc076..000000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -sudo: required -language: ruby -cache: - directories: - - vendor/bundle - - ~/.gradle/ -rvm: - - jruby-9.1.10.0 -jdk: - - oraclejdk8 -env: - - INTEGRATION=false SPEC_OPTS="--order rand --format documentation" JRUBY_OPTS='-Xcompile.invokedynamic=false' - - INTEGRATION=true SPEC_OPTS="--order rand --format documentation" JRUBY_OPTS='-Xcompile.invokedynamic=false' - - INTEGRATION=false FEATURE_FLAG=persistent_queues SPEC_OPTS="--order rand --format documentation" JRUBY_OPTS='-Xcompile.invokedynamic=false' - - INTEGRATION=true FEATURE_FLAG=persistent_queues SPEC_OPTS="--order rand --format documentation" JRUBY_OPTS='-Xcompile.invokedynamic=false' -before_install: - - export JRUBY_OPTS="" - # Force bundler 1.12.5 because version 1.13 has issues, see https://github.com/fastlane/fastlane/issues/6065#issuecomment-246044617 - - yes | gem uninstall -q -i /home/travis/.rvm/gems/jruby-9.1.10.0@global bundler - - gem install bundler -v 1.12.5 --no-rdoc --no-ri --no-document --quiet -install: - - rake test:install-core -script: - - |+ - if [ "$INTEGRATION" == "true" ]; then - ci/travis_integration_install.sh - ci/travis_integration_run.sh; - else - rake test:core - fi diff --git a/ci/ci_acceptance.sh b/ci/ci_acceptance.sh deleted file mode 100755 index 8a2d5cccf..000000000 --- a/ci/ci_acceptance.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash -set -e - -# Since we are using the system jruby, we need to make sure our jvm process -# uses at least 1g of memory, If we don't do this we can get OOM issues when -# installing gems. See https://github.com/elastic/logstash/issues/5179 -export JRUBY_OPTS="-J-Xmx1g" - -SELECTED_TEST_SUITE=$1 - -# The acceptance test in our CI infrastructure doesn't clear the workspace between run -# this mean the lock of the Gemfile can be sticky from a previous run, before generating any package -# we will clear them out to make sure we use the latest version of theses files -# If we don't do this we will run into gem Conflict error. -[ -f Gemfile ] && rm Gemfile -[ -f Gemfile.jruby-2.3.lock ] && rm Gemfile.jruby-2.3.lock - -if [[ $SELECTED_TEST_SUITE == $"redhat" ]]; then - echo "Generating the RPM, make sure you start with a clean environment before generating other packages." - rake artifact:rpm - echo "Acceptance: Installing dependencies" - cd qa - bundle install - - echo "Acceptance: Running the tests" - bundle exec rake qa:vm:setup["redhat"] - bundle exec rake qa:vm:ssh_config - bundle exec rake qa:acceptance:redhat - bundle exec rake qa:vm:halt["redhat"] -elif [[ $SELECTED_TEST_SUITE == $"debian" ]]; then - echo "Generating the DEB, make sure you start with a clean environment before generating other packages." - rake artifact:deb - echo "Acceptance: Installing dependencies" - cd qa - bundle install - - echo "Acceptance: Running the tests" - bundle exec rake qa:vm:setup["debian"] - bundle exec rake qa:vm:ssh_config - bundle exec rake qa:acceptance:debian - bundle exec rake qa:vm:halt["debian"] -elif [[ $SELECTED_TEST_SUITE == $"all" ]]; then - echo "Building Logstash artifacts" - rake artifact:all - - echo "Acceptance: Installing dependencies" - cd qa - bundle install - - echo "Acceptance: Running the tests" - bundle exec rake qa:vm:setup - bundle exec rake qa:vm:ssh_config - bundle exec rake qa:acceptance:all - bundle exec rake qa:vm:halt - cd .. -fi diff --git a/ci/ci_integration.sh b/ci/ci_integration.sh deleted file mode 100755 index d8b6fa6b8..000000000 --- a/ci/ci_integration.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -set -e - -# Since we are using the system jruby, we need to make sure our jvm process -# uses at least 1g of memory, If we don't do this we can get OOM issues when -# installing gems. See https://github.com/elastic/logstash/issues/5179 -export JRUBY_OPTS="-J-Xmx1g" - -echo "Running integration tests from qa/integration" -if [[ ! -d "build" ]]; then - mkdir build -fi -rm -rf build/* -echo "Building logstash tar file in build/" -rake artifact:tar -cd build -echo "Extracting logstash tar file in build/" -tar xf *.tar.gz - -cd ../qa/integration -# to install test dependencies -bundle install -# runs all tests -rspec diff --git a/ci/ci_setup.sh b/ci/ci_setup.sh deleted file mode 100755 index 997405565..000000000 --- a/ci/ci_setup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -set -e - -## -# Note this setup needs a system ruby to be available, this can not -# be done here as is highly system dependant. -## - -#squid proxy work, so if there is a proxy it can be cached. -sed -i.bak 's/https:/http:/' Gemfile - -# Clean up some possible stale directories -rm -rf vendor # make sure there are no vendorized dependencies -rm -rf .bundle -rm -rf spec/reports # no stale spec reports from previous executions - -# Since we are using the system jruby, we need to make sure our jvm process -# uses at least 1g of memory, If we don't do this we can get OOM issues when -# installing gems. See https://github.com/elastic/logstash/issues/5179 -export JRUBY_OPTS="-J-Xmx1g" - -# Setup the environment -rake bootstrap # Bootstrap your logstash instance - -# Set up some general options for the rspec runner -echo "--order rand" > .rspec -echo "--format progress" >> .rspec -echo "--format CI::Reporter::RSpecFormatter" >> .rspec diff --git a/ci/ci_test.bat b/ci/ci_test.bat deleted file mode 100644 index f7da1428b..000000000 --- a/ci/ci_test.bat +++ /dev/null @@ -1,35 +0,0 @@ -@echo off - -setlocal - -REM Since we are using the system jruby, we need to make sure our jvm process -REM uses at least 1g of memory, If we don't do this we can get OOM issues when -REM installing gems. See https://github.com/elastic/logstash/issues/5179 - -SET JRUBY_OPTS="-J-Xmx1g" -SET SELECTEDTESTSUITE=%1 -SET /p JRUBYVERSION=<.ruby-version - -IF NOT EXIST %JRUBYSRCDIR% ( - echo "Variable JRUBYSRCDIR must be declared with a valid directory. Aborting.." - exit /B 1 -) - -SET JRUBYPATH=%JRUBYSRCDIR%\%JRUBYVERSION% - -IF NOT EXIST %JRUBYPATH% ( - echo "Could not find JRuby in %JRUBYPATH%. Aborting.." - exit /B 1 -) - -SET RAKEPATH=%JRUBYPATH%\bin\rake - -IF "%SELECTEDTESTSUITE%"=="core-fail-fast" ( - echo "Running core-fail-fast tests" - %RAKEPATH% test:install-core - %RAKEPATH% test:core-fail-fast -) ELSE ( - echo "Running core tests" - %RAKEPATH% test:install-core - %RAKEPATH% test:core -) diff --git a/ci/ci_test.sh b/ci/ci_test.sh deleted file mode 100755 index aa55c42de..000000000 --- a/ci/ci_test.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -set -e - -## -# Keep in mind to run ci/ci_setup.sh if you need to setup/clean up your environment before -# running the test suites here. -## - -# Since we are using the system jruby, we need to make sure our jvm process -# uses at least 1g of memory, If we don't do this we can get OOM issues when -# installing gems. See https://github.com/elastic/logstash/issues/5179 -export JRUBY_OPTS="-J-Xmx1g" - -SELECTED_TEST_SUITE=$1 - -if [[ $SELECTED_TEST_SUITE == $"core-fail-fast" ]]; then - echo "Running core-fail-fast tests" - rake test:install-core # Install core dependencies for testing. - rake test:core-fail-fast # Run core tests -else - echo "Running core tests" - rake test:install-core # Install core dependencies for testing. - rake test:core # Run core tests -fi diff --git a/ci/travis_integration_install.sh b/ci/travis_integration_install.sh deleted file mode 100755 index 27d3a097f..000000000 --- a/ci/travis_integration_install.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -set -e - -# This file sets up the environment for travis integration tests - - -if [[ "$INTEGRATION" != "true" ]]; then - exit -fi - -echo "Setting up integration tests" -if [[ ! -d "build" ]]; then - mkdir build -fi -rm -rf build/* -echo "Building logstash tar file in build/" -rake artifact:tar -cd build -echo "Extracting logstash tar file in build/" -tar xf *.tar.gz - -cd ../qa/integration -pwd -echo $BUNDLE_GEMFILE -# to install test dependencies -bundle install --gemfile="./Gemfile" diff --git a/ci/travis_integration_run.sh b/ci/travis_integration_run.sh deleted file mode 100755 index 4ea12533d..000000000 --- a/ci/travis_integration_run.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -set -e - -if [[ "$INTEGRATION" != "true" ]]; then - exit -fi - -echo "Running integration tests from qa/integration directory" -cd qa/integration - -# The offline specs can break the online ones -# due to some sideeffects of the seccomp policy interfering with -# the docker daemon -# See prepare_offline_pack_spec.rb for details -bundle exec rspec --tag ~offline -bundle exec rspec --tag offline