update comments and docs about running envoy integration tests with t…

…he ENVOY_VERSION set. (#18614) update ENVOY_VERSION and documentation of it used in the bats envoy tests. Co-authored-by: github-team-consul-core <github-team-consul-core@hashicorp.com>
hashicorp · Aug 30, 2023 · 255aa15 · 255aa15
1 parent 0f48b7a
commit 255aa15
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -334,6 +334,7 @@ other-consul: ## Checking for other consul instances
 # Use GO_TEST_FLAGS to run specific tests:
 #      make test-envoy-integ GO_TEST_FLAGS="-run TestEnvoy/case-basic"
 # NOTE: Always uses amd64 images, even when running on M1 macs, to match CI/CD environment.
+#       You can also specify the envoy version (example: 1.27.0) setting the environment variable: ENVOY_VERSION=1.27.0
 .PHONY: test-envoy-integ
 test-envoy-integ: $(ENVOY_INTEG_DEPS) ## Run integration tests.
 	@go test -v -timeout=30m -tags integration $(GO_TEST_FLAGS) ./test/integration/connect/envoy

diff --git a/build-support/windows/build-consul-local-images.sh b/build-support/windows/build-consul-local-images.sh
@@ -10,7 +10,7 @@ VERSION=${VERSION:-"1.16.0"}
 export VERSION
 
 # Build Windows Envoy Version 1.23.1 / 1.21.5 / 1.20.7
-ENVOY_VERSION=${ENVOY_VERSION:-"1.23.1"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.27.0"}
 export ENVOY_VERSION
 
 echo "Building Images"

diff --git a/test/integration/connect/envoy/README.md b/test/integration/connect/envoy/README.md
@@ -52,6 +52,7 @@ Where `case-basic` can be replaced by any directory name from this directory.
 * When tests fail in CI, logs and additional debugging data are available in the artifacts of the test run.
 * You can re-run the tests locally by running `make test-envoy-integ GO_TEST_FLAGS="-run TestEnvoy/<case-directory>"` where `<case-directory>` is
   replaced with the name of the directory, e.g. `case-basic`.
+* You can override the envoy version by specifying `ENVOY_VERSION=<your envoy version>` eg. `ENVOY_VERSION=1.27.0 make test-envoy-integ`.
 * Locally, all the logs of the failed test will be available in `workdir` in this directory.
 * You can run with `DEBUG=1` to print out all the commands being run, e.g. `DEBUG=1 make test-envoy-integ GO_TEST_FLAGS="-run TestEnvoy/case-basic"`.
 * If you want to prevent the Docker containers from being spun down after test failure, add a `sleep 9999` to the `verify.bats` test case that's failing.

diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
@@ -15,7 +15,7 @@ DEBUG=${DEBUG:-}
 XDS_TARGET=${XDS_TARGET:-server}
 
 # ENVOY_VERSION to run each test against
-ENVOY_VERSION=${ENVOY_VERSION:-"1.23.1"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.27.0"}
 export ENVOY_VERSION
 
 export DOCKER_BUILDKIT=1

diff --git a/test/integration/connect/envoy/run-tests.windows.sh b/test/integration/connect/envoy/run-tests.windows.sh
@@ -20,7 +20,7 @@ DEBUG=${DEBUG:-}
 XDS_TARGET=${XDS_TARGET:-server}
 
 # ENVOY_VERSION to run each test against
-ENVOY_VERSION=${ENVOY_VERSION:-"1.23.1"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.27.0"}
 export ENVOY_VERSION
 
 export DOCKER_BUILDKIT=0