add 1.12.2

hashicorp · Feb 7, 2020 · 66cd15d · 66cd15d
1 parent 9a220f3
commit 66cd15d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -510,13 +510,13 @@ jobs:
           path: ui-v2/test-results
 
   # Envoy integration tests. Require docker dev binary to be built already
-  envoy-integration-test-1.8.0:
+  envoy-integration-test-1.9.1:
     docker:
       # We only really need bash and docker-compose which is installed on all
       # Circle images but pick Go since we have to pick one of them.
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSIONS: "1.8.0"
+      ENVOY_VERSIONS: "1.9.1"
     steps: &ENVOY_INTEGRATION_TEST_STEPS
       - checkout
       # Get go binary from workspace
@@ -536,25 +536,25 @@ jobs:
           path: ./test/integration/connect/envoy/workdir/logs
           destination: container-logs
 
-  envoy-integration-test-1.9.1:
+  envoy-integration-test-1.10.0:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSIONS: "1.9.1"
+      ENVOY_VERSIONS: "1.10.0"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
-  envoy-integration-test-1.10.0:
+  envoy-integration-test-1.11.2:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSIONS: "1.10.0"
+      ENVOY_VERSIONS: "1.11.2"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
-  envoy-integration-test-1.11.1:
+  envoy-integration-test-1.12.2:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSIONS: "1.11.1"
+      ENVOY_VERSIONS: "1.12.2"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
   # run tests on vault ca provider integration tests
@@ -640,16 +640,16 @@ workflows:
       - nomad-integration-0_8:
           requires:
             - dev-build
-      - envoy-integration-test-1.8.0:
-          requires:
-            - dev-build
       - envoy-integration-test-1.9.1:
           requires:
             - dev-build
       - envoy-integration-test-1.10.0:
           requires:
             - dev-build
-      - envoy-integration-test-1.11.1:
+      - envoy-integration-test-1.11.2:
+          requires:
+            - dev-build
+      - envoy-integration-test-1.12.2:
           requires:
             - dev-build
       - vault-ca-provider:

diff --git 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 1.11.2"}
+ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.9.1 1.10.0 1.11.2 1.12.2"}
 
 if [ ! -z "$DEBUG" ] ; then
   set -x

diff --git a/website/source/docs/connect/proxies/envoy.md b/website/source/docs/connect/proxies/envoy.md
@@ -36,7 +36,8 @@ compatible Envoy versions.
 
 | Consul Version | Compatible Envoy Versions |
 |---|---|
-| 1.5.2 and higher | 1.11.1 1.10.0, 1.9.1, 1.8.0† |
+| 1.7.0 and higher | 1.12.2, 1.11.2, 1.10.0, 1.9.1 |
+| 1.5.2, 1.5.3, 1.6.x | 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† |