diff --git a/.ci/docker-setup.sh b/.ci/docker-setup.sh deleted file mode 100755 index d63efd90..00000000 --- a/.ci/docker-setup.sh +++ /dev/null @@ -1,89 +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 - -pull_docker_snapshot() { - project="${1?project name required}" - stack_version_alias="${2?stack version alias required}" - local docker_image="docker.elastic.co/${project}/${project}${DISTRIBUTION_SUFFIX}:${ELASTIC_STACK_VERSION}" - echo "Pulling $docker_image" - if docker pull "$docker_image" ; then - echo "docker pull successful" - else - case "$ELASTIC_STACK_VERSION_ARG" in - "8.previous"|"8.current"|"8.next") - exit 1 - ;; - *) - exit 2 - ;; - esac - fi -} - -VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash_releases.json" - -if [ -z "${ELASTIC_STACK_VERSION}" ]; then - echo "Please set the ELASTIC_STACK_VERSION environment variable" - echo "For example: export ELASTIC_STACK_VERSION=7.x" - exit 1 -fi - -# The ELASTIC_STACK_VERSION may be an alias, save the original before translating it -ELASTIC_STACK_VERSION_ALIAS="$ELASTIC_STACK_VERSION" - -echo "Fetching versions from $VERSION_URL" -VERSIONS=$(curl -s $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 -elif [[ "$ELASTIC_STACK_VERSION" == "8.next" ]]; then - # we know "8.next" only exists between FF and GA of a minor - # exit 1 so the build is skipped - exit 1 -fi - -case "${DISTRIBUTION}" in - default) DISTRIBUTION_SUFFIX="" ;; # empty string when explicit "default" is given - *) DISTRIBUTION_SUFFIX="${DISTRIBUTION/*/-}${DISTRIBUTION}" ;; -esac -export DISTRIBUTION_SUFFIX - -echo "Testing against version: $ELASTIC_STACK_VERSION (distribution: ${DISTRIBUTION:-"default"})" - -if [[ "$ELASTIC_STACK_VERSION" = *"-SNAPSHOT" ]]; then - pull_docker_snapshot "logstash" $ELASTIC_STACK_VERSION_ALIAS - if [ "$INTEGRATION" == "true" ]; then - pull_docker_snapshot "elasticsearch" $ELASTIC_STACK_VERSION_ALIAS - fi -fi - -if [ -f Gemfile.lock ]; then - rm Gemfile.lock -fi - -CURRENT_DIR=$(dirname "${BASH_SOURCE[0]}") - -cd .ci - -export BUILDKIT_PROGRESS=plain -if [ "$INTEGRATION" == "true" ]; then - docker-compose down - docker-compose build --quiet -else - docker-compose down - docker-compose build logstash --quiet -fi diff --git a/.travis.yml b/.travis.yml index 5e29addb..51b72de8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,7 @@ jobs: - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=7.current - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.previous - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.current - - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.next - - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.next + - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=main - stage: "Secure Integration Tests" env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=7.current @@ -22,5 +21,6 @@ jobs: - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current ES_SSL_KEY_INVALID=true - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current ES_SSL_SUPPORTED_PROTOCOLS=TLSv1.3 - - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=8.next - - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=9.next + - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=8.current + - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=9.current + - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=main \ No newline at end of file