Update to centralized travis configuration

ci/Dockerfile.elasticsearch → .ci/Dockerfile.elasticsearch

@@ -1,10 +1,10 @@
-ARG elastic_stack_version
-FROM docker.elastic.co/elasticsearch/elasticsearch$distribution_suffix:$elastic_stack_version
+ARG ELASTIC_STACK_VERSION
+FROM docker.elastic.co/elasticsearch/elasticsearch$distribution_suffix:$ELASTIC_STACK_VERSION
 
-ARG plugin_path=/usr/share/plugins/this
+ARG plugin_path=/usr/share/plugins/plugin
 ARG es_path=/usr/share/elasticsearch
 ARG es_yml=$es_path/config/elasticsearch.yml
 
 RUN rm -f $es_path/config/scripts
 
-COPY --chown=elasticsearch:elasticsearch ci/elasticsearch-run.sh $es_path/
+COPY --chown=elasticsearch:elasticsearch .ci/elasticsearch-run.sh $es_path/

.ci/docker-compose.override.yml

@@ -0,0 +1,24 @@
+version: '3'
+
+services:
+
+  logstash:
+    command: /usr/share/plugins/plugin/.ci/logstash-run.sh
+    environment:
+        - INTEGRATION=${INTEGRATION:-false}
+        - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
+
+  elasticsearch:
+    build:
+      context: ../
+      dockerfile: .ci/Dockerfile.elasticsearch
+      args:
+        - ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
+        - INTEGRATION=${INTEGRATION:-false}
+        - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
+    command: /usr/share/elasticsearch/elasticsearch-run.sh
+    tty: true
+    ports:
+      - "9200:9200"
+    user: elasticsearch
+

ci/docker-run.sh → .ci/docker-run.sh

@@ -2,8 +2,11 @@
 
 # This is intended to be run inside the docker container as the command of the docker-compose.
 set -ex
+
+cd .ci
+
 if [ "$INTEGRATION" == "true" ]; then
-    docker-compose -f ci/docker-compose.yml up --exit-code-from logstash
+    docker-compose up --exit-code-from logstash
 else
-    docker-compose -f ci/docker-compose.yml up --exit-code-from logstash logstash
+    docker-compose up --exit-code-from logstash logstash
 fi

ci/docker-setup.sh → .ci/docker-setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This is intended to be run the plugin's root directory. `ci/docker-test.sh`
+# This is intended to be run the plugin's root directory. `.ci/docker-setup.sh`
 # Ensure you have Docker installed locally and set the ELASTIC_STACK_VERSION environment variable.
 set -e
 
@@ -61,12 +61,14 @@ if [ "$ELASTIC_STACK_VERSION" ]; then
         rm Gemfile.lock
     fi
 
+    cd .ci
+
     if [ "$INTEGRATION" == "true" ]; then
-        docker-compose -f ci/docker-compose.yml down
-        docker-compose -f ci/docker-compose.yml build
+        docker-compose down
+        docker-compose build
     else
-        docker-compose -f ci/docker-compose.yml down
-        docker-compose -f ci/docker-compose.yml build logstash 
+        docker-compose down
+        docker-compose build logstash
     fi
 else
     echo "Please set the ELASTIC_STACK_VERSION environment variable"

.travis.yml

@@ -1,10 +1,6 @@
----
-sudo: required
-services: docker
-addons:
-  apt:
-    packages:
-    - docker-ce
+import:
+- logstash-plugins/.ci:travis/[email protected]
+
 env:
   - INTEGRATION=false ELASTIC_STACK_VERSION=5.x
   - INTEGRATION=false ELASTIC_STACK_VERSION=6.x
@@ -14,5 +10,3 @@ env:
   - INTEGRATION=true ELASTIC_STACK_VERSION=7.x SNAPSHOT=true
   - INTEGRATION=true ELASTIC_STACK_VERSION=8.x SNAPSHOT=true
   - INTEGRATION=true ELASTIC_STACK_VERSION=7.x
-install: ci/docker-setup.sh
-script: ci/docker-run.sh