From 9a5b258edf12f7db1ff8c079411d111c65c558f3 Mon Sep 17 00:00:00 2001
From: Matt Keeler <mkeeler@users.noreply.github.com>
Date: Tue, 20 Aug 2019 10:20:13 -0400
Subject: [PATCH] Turned on Envoy 1.11.1 integration tests (#6347)

I also ran this against 1.5.2 so the docs update claiming compatibility should still be accurate.
---
 .circleci/config.yml                         | 7 +++++++
 test/integration/connect/envoy/run-tests.sh  | 2 +-
 website/source/docs/connect/proxies/envoy.md | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2b98390e5cd8..fe63f8f1b79a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -501,6 +501,13 @@ jobs:
       ENVOY_VERSIONS: "1.10.0"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
+  envoy-integration-test-1.11.1:
+    docker:
+      - image: *GOLANG_IMAGE
+    environment:
+      ENVOY_VERSIONS: "1.11.1"
+    steps: *ENVOY_INTEGRATION_TEST_STEPS
+
   # This job merges master into the 'current' branch (${CIRCLE_BRANCH}) specified
   # in the branch filtering of the workflow
   merge-master:
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index 571651509344..fe8c90e6b926 100755
--- a/test/integration/connect/envoy/run-tests.sh
+++ b/test/integration/connect/envoy/run-tests.sh
@@ -17,7 +17,7 @@ FILTER_TESTS=${FILTER_TESTS:-}
 STOP_ON_FAIL=${STOP_ON_FAIL:-}
 
 # ENVOY_VERSIONS is the list of envoy versions to run each test against
-ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.9.1 1.8.0"}
+ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.9.1 1.8.0 1.11.1"}
 
 if [ ! -z "$DEBUG" ] ; then
   set -x
diff --git a/website/source/docs/connect/proxies/envoy.md b/website/source/docs/connect/proxies/envoy.md
index 36b01c034968..48f0fe89de0d 100644
--- a/website/source/docs/connect/proxies/envoy.md
+++ b/website/source/docs/connect/proxies/envoy.md
@@ -36,7 +36,7 @@ compatible Envoy versions.
 
 | Consul Version | Compatible Envoy Versions |
 |---|---|
-| 1.5.2 and higher | 1.10.0, 1.9.1, 1.8.0† |
+| 1.5.2 and higher | 1.11.1 1.10.0, 1.9.1, 1.8.0† |
 | 1.5.0, 1.5.1 | 1.9.1, 1.8.0† |
 | 1.3.x, 1.4.x | 1.9.1, 1.8.0†, 1.7.0† |