From ce86fdbdb2123106ffab6fda46d9d4a7c463523d Mon Sep 17 00:00:00 2001
From: Ted Poole <tpoole@redhat.com>
Date: Wed, 3 Jul 2024 11:15:34 +0100
Subject: [PATCH] Also run envoy utests

Signed-off-by: Ted Poole <tpoole@redhat.com>
---
 maistra/bazelrc          | 14 +++++++++++---
 maistra/ci/pre-submit.sh |  3 +++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/maistra/bazelrc b/maistra/bazelrc
index 04e349eb3fa..2ade1047b6c 100644
--- a/maistra/bazelrc
+++ b/maistra/bazelrc
@@ -12,9 +12,17 @@ build --test_env=ENVOY_IP_TEST_VERSIONS=v4only
 build --test_env=HEAPCHECK=minimal
 build --test_output=all
 
-# As of today we do not support QUIC/HTTP3 -- hence we exclude it from the build, always.
-build --deleted_packages=@envoy//test/common/quic,@envoy//test/common/quic/platform
-build --@envoy//bazel:http3=false
+# As of today we do not support QUIC/HTTP3, hence we exclude it from the build, always.
+# Unfortunately, just setting //bazel:http3=False, is not enough to achieve this.
+# Instead, we also have to use boringssl=fips define and filter on the nofips tag.
+# This is based on the fact that the FIPS version of BoringSSL doesn't provide enough
+# of the functions required to build the QUIC implementation provided by Quiche i.e. if
+# we say that we are using the FIPS version of BoringSSL, then all the QUIC support is
+# excluded from the build.
+common --@envoy//bazel:http3=False
+common --define=boringssl=fips
+build --build_tag_filters=-nofips
+test --test_tag_filters=-nofips
 
 # Arch-specific build flags, triggered with --config=$ARCH in bazel build command
 build:x86_64 --linkopt=-fuse-ld=lld
diff --git a/maistra/ci/pre-submit.sh b/maistra/ci/pre-submit.sh
index 28b2fd8f39e..48866826ec5 100755
--- a/maistra/ci/pre-submit.sh
+++ b/maistra/ci/pre-submit.sh
@@ -15,6 +15,9 @@ time bazel_build //:envoy
 echo "Build succeeded. Binary generated:"
 bazel-bin/envoy --version
 
+# Run envoy tests
+time bazel_test @envoy//test/...
+
 # Run tests
 time bazel_test //...