From 2cca9dc4acea7dadd203a6b0645bac0d825888d1 Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Wed, 18 Mar 2020 17:32:52 +0000 Subject: [PATCH] update to centralized travis configuration --- .travis.yml | 20 ++------------- ci/unit/Dockerfile | 12 --------- ci/unit/docker-compose.yml | 22 ---------------- ci/unit/docker-run.sh | 5 ---- ci/unit/docker-setup.sh | 51 -------------------------------------- ci/unit/run.sh | 6 ----- 6 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 ci/unit/Dockerfile delete mode 100644 ci/unit/docker-compose.yml delete mode 100755 ci/unit/docker-run.sh delete mode 100755 ci/unit/docker-setup.sh delete mode 100755 ci/unit/run.sh diff --git a/.travis.yml b/.travis.yml index 744332f..a50fc73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,2 @@ ---- -sudo: required -services: docker -addons: - apt: - packages: - - docker-ce -matrix: - include: - - env: SNAPSHOT=true ELASTIC_STACK_VERSION=8.x - - env: SNAPSHOT=true ELASTIC_STACK_VERSION=7.x - - env: ELASTIC_STACK_VERSION=7.x - - env: SNAPSHOT=true ELASTIC_STACK_VERSION=6.x - - env: ELASTIC_STACK_VERSION=6.x - - env: ELASTIC_STACK_VERSION=5.x - fast_finish: true -install: ci/unit/docker-setup.sh -script: ci/unit/docker-run.sh +import: +- logstash-plugins/.ci:travis/travis.yml@1.x \ No newline at end of file diff --git a/ci/unit/Dockerfile b/ci/unit/Dockerfile deleted file mode 100644 index 934fe24..0000000 --- a/ci/unit/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -ARG ELASTIC_STACK_VERSION -FROM docker.elastic.co/logstash/logstash:$ELASTIC_STACK_VERSION -COPY --chown=logstash:logstash Gemfile /usr/share/plugins/this/Gemfile -COPY --chown=logstash:logstash *.gemspec /usr/share/plugins/this/ -RUN cp /usr/share/logstash/logstash-core/versions-gem-copy.yml /usr/share/logstash/versions.yml -ENV PATH="${PATH}:/usr/share/logstash/vendor/jruby/bin" -ENV LOGSTASH_SOURCE=1 -ENV JARS_SKIP="true" -RUN gem install bundler -v '< 2' -WORKDIR /usr/share/plugins/this -RUN bundle install -COPY --chown=logstash:logstash . /usr/share/plugins/this diff --git a/ci/unit/docker-compose.yml b/ci/unit/docker-compose.yml deleted file mode 100644 index 8f45aa6..0000000 --- a/ci/unit/docker-compose.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: '3' - -# run tests: cd ci/unit; docker-compose up --build --force-recreate -# manual: cd ci/unit; docker-compose run logstash bash -services: - - logstash: - build: - context: ../../ - dockerfile: ci/unit/Dockerfile - args: - - ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION - command: /usr/share/plugins/this/ci/unit/run.sh - environment: - LS_JAVA_OPTS: "-Xmx256m -Xms256m" - LOGSTASH_SOURCE: 1 - JARS_SKIP: "true" - OSS: "true" - tty: true - #volumes: - # - ./:/usr/share/plugins/this - diff --git a/ci/unit/docker-run.sh b/ci/unit/docker-run.sh deleted file mode 100755 index e73aedf..0000000 --- a/ci/unit/docker-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# This is intended to be run inside the docker container as the command of the docker-compose. -set -ex -docker-compose -f ci/unit/docker-compose.yml up --exit-code-from logstash diff --git a/ci/unit/docker-setup.sh b/ci/unit/docker-setup.sh deleted file mode 100755 index 9c30679..0000000 --- a/ci/unit/docker-setup.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -# This is intended to be run the plugin's root directory. `ci/unit/docker-test.sh` -# Ensure you have Docker installed locally and set the ELASTIC_STACK_VERSION environment variable. -set -e - -VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/master/ci/logstash_releases.json" - -if [ "$ELASTIC_STACK_VERSION" ]; then - echo "Fetching versions from $VERSION_URL" - VERSIONS=$(curl $VERSION_URL) - if [[ "$SNAPSHOT" = "true" ]]; then - ELASTIC_STACK_RETRIEVED_VERSION=$(echo $VERSIONS | jq '.snapshots."'"$ELASTIC_STACK_VERSION"'"') - echo $ELASTIC_STACK_RETRIEVED_VERSION - else - ELASTIC_STACK_RETRIEVED_VERSION=$(echo $VERSIONS | jq '.releases."'"$ELASTIC_STACK_VERSION"'"') - fi - if [[ "$ELASTIC_STACK_RETRIEVED_VERSION" != "null" ]]; then - # remove starting and trailing double quotes - ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION%\"}" - ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION#\"}" - echo "Translated $ELASTIC_STACK_VERSION to ${ELASTIC_STACK_RETRIEVED_VERSION}" - export ELASTIC_STACK_VERSION=$ELASTIC_STACK_RETRIEVED_VERSION - fi - - echo "Testing against version: $ELASTIC_STACK_VERSION" - - if [[ "$ELASTIC_STACK_VERSION" = *"-SNAPSHOT" ]]; then - cd /tmp - wget https://snapshots.elastic.co/docker/logstash-"$ELASTIC_STACK_VERSION".tar.gz - tar xfvz logstash-"$ELASTIC_STACK_VERSION".tar.gz repositories - echo "Loading docker image: " - cat repositories - docker load < logstash-"$ELASTIC_STACK_VERSION".tar.gz - rm logstash-"$ELASTIC_STACK_VERSION".tar.gz - cd - - fi - - if [ -f Gemfile.lock ]; then - rm Gemfile.lock - fi - - docker-compose -f ci/unit/docker-compose.yml down - docker-compose -f ci/unit/docker-compose.yml build - #docker-compose -f ci/unit/docker-compose.yml up --exit-code-from logstash --force-recreate -else - echo "Please set the ELASTIC_STACK_VERSION environment variable" - echo "For example: export ELASTIC_STACK_VERSION=6.2.4" - exit 1 -fi - diff --git a/ci/unit/run.sh b/ci/unit/run.sh deleted file mode 100755 index 91e54bb..0000000 --- a/ci/unit/run.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# This is intended to be run inside the docker container as the command of the docker-compose. -set -ex - -bundle exec rspec -fd --pattern spec/**/*_spec.rb,spec/**/*_specs.rb