From 255aa158db8ccbfd445205654e153742b127116d Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 30 Aug 2023 11:31:40 -0600 Subject: [PATCH] update comments and docs about running envoy integration tests with the ENVOY_VERSION set. (#18614) update ENVOY_VERSION and documentation of it used in the bats envoy tests. Co-authored-by: github-team-consul-core --- Makefile | 1 + build-support/windows/build-consul-local-images.sh | 2 +- test/integration/connect/envoy/README.md | 1 + test/integration/connect/envoy/run-tests.sh | 2 +- test/integration/connect/envoy/run-tests.windows.sh | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1fe0d1b75a..4ca2072dba 100644 --- 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 index 8398e813bb..4a22b35706 100644 --- 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 index a97acc710a..ef358e7a2b 100644 --- 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/"` where `` is replaced with the name of the directory, e.g. `case-basic`. +* You can override the envoy version by specifying `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 index fa1d64312d..900d3cbfd3 100755 --- 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 index b8ba4a1ee6..c4dcff6ce4 100644 --- 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