Skip to content

Commit

Permalink
Turned on Envoy 1.11.1 integration tests (#6347)
Browse files Browse the repository at this point in the history
I also ran this against 1.5.2 so the docs update claiming compatibility should still be accurate.
  • Loading branch information
mkeeler authored Aug 20, 2019
1 parent 11720fd commit 9a5b258
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/integration/connect/envoy/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/connect/proxies/envoy.md
Original file line number Diff line number Diff line change
Expand Up @@ -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† |

Expand Down

0 comments on commit 9a5b258

Please sign in to comment.