Merge pull request #226 from logstash-plugins/jsvd-patch-1

remove .travis.yml customization

Author: donoghuc

.travis.yml

@@ -1,8 +1,7 @@
 import:
-- logstash-plugins/.ci:travis/defaults.yml@1.x
-- logstash-plugins/.ci:travis/exec.yml@1.x
+- logstash-plugins/.ci:travis/travis.yml@1.x
 
-env:
-  jobs:
-    - ELASTIC_STACK_VERSION=8.x DOCKER_ENV=dockerjdk17.env
-    - SNAPSHOT=true ELASTIC_STACK_VERSION=8.x DOCKER_ENV=dockerjdk17.env
+jobs:
+  exclude:
+  - env: ELASTIC_STACK_VERSION=7.current
+  - env: SNAPSHOT=true ELASTIC_STACK_VERSION=7.current

spec/inputs/tcp_spec.rb

@@ -90,7 +90,9 @@ def get_port
         aggregate_failures("event #{i}") do
           expect(event.get("message")).to eq("#{i} ☹")
           expect(event.get(ecs_select[disabled: "host", v1: "[@metadata][input][tcp][source][name]"])).to eq("localhost").or eq("ip6-localhost")
-          expect(event.get(ecs_select[disabled: "[@metadata][ip_address]", v1: "[@metadata][input][tcp][source][ip]"])).to eq('127.0.0.1')
+          ip_address = event.get(ecs_select[disabled: "[@metadata][ip_address]", v1: "[@metadata][input][tcp][source][ip]"])
+          # Account for both ipv4 or ipv6 localhost
+          expect(["127.0.0.1", "::1", "0:0:0:0:0:0:0:1"]).to include(ip_address)
         end
       end
     end