More experiments

Signed-off-by: Jonh Wendell <[email protected]>

Author: jwendell

bazel/envoy_test.bzl

@@ -86,6 +86,7 @@ def envoy_cc_fuzz_test(
         size = "medium",
         deps = [],
         tags = [],
+        env = {},
         **kwargs):
     exec_properties = exec_properties | select({
         repository + "//bazel:engflow_rbe_x86_64": {"Pool": rbe_pool} if rbe_pool else {},
@@ -113,6 +114,11 @@ def envoy_cc_fuzz_test(
         **kwargs
     )
 
+    real_env = dict(env)
+    real_env.update({
+        "LD_LIBRARY_PATH": "/build/bazel_root/base/execroot/envoy/bazel-out/k8-fastbuild/bin/external/openssl/openssl/lib64",
+    })
+
     native.cc_test(
         name = name,
         copts = envoy_copts("@envoy", test = True),
@@ -140,6 +146,7 @@ def envoy_cc_fuzz_test(
         }),
         size = size,
         tags = ["fuzz_target"] + tags,
+        env = real_env,
     )
 
     fuzzing_decoration(
@@ -178,6 +185,12 @@ def envoy_cc_test(
         repository + "//bazel:engflow_rbe_x86_64": {"Pool": rbe_pool} if rbe_pool else {},
         "//conditions:default": {},
     })
+
+    real_env = dict(env)
+    real_env.update({
+        "LD_LIBRARY_PATH": "/build/bazel_root/base/execroot/envoy/bazel-out/k8-fastbuild/bin/external/openssl/openssl/lib64",
+    })
+
     native.cc_test(
         name = name,
         srcs = srcs,
@@ -200,7 +213,7 @@ def envoy_cc_test(
         shard_count = shard_count,
         size = size,
         flaky = flaky,
-        env = env,
+        env = real_env,
         exec_properties = exec_properties,
     )
 
@@ -288,20 +301,28 @@ def envoy_benchmark_test(
         data = [],
         rbe_pool = None,
         exec_properties = {},
+        env = {},
         tags = [],
         repository = "",
         **kargs):
     exec_properties = exec_properties | select({
         repository + "//bazel:engflow_rbe_x86_64": {"Pool": rbe_pool} if rbe_pool else {},
         "//conditions:default": {},
     })
+
+    real_env = dict(env)
+    real_env.update({
+        "LD_LIBRARY_PATH": "/build/bazel_root/base/execroot/envoy/bazel-out/k8-fastbuild/bin/external/openssl/openssl/lib64",
+    })
+
     native.sh_test(
         name = name,
         srcs = [repository + "//bazel:test_for_benchmark_wrapper.sh"],
         data = [":" + benchmark_binary] + data,
         exec_properties = exec_properties,
         args = ["%s/%s" % (native.package_name(), benchmark_binary)],
         tags = tags + ["nocoverage"],
+        env = real_env,
         **kargs
     )
 
@@ -341,6 +362,7 @@ def envoy_sh_test(
         coverage = True,
         cc_binary = [],
         tags = [],
+        env = {},
         **kargs):
     if coverage:
         if cc_binary == []:
@@ -358,16 +380,22 @@ def envoy_sh_test(
             srcs = [test_runner_cc],
             data = srcs + data + cc_binary,
             tags = tags,
+            env = env,
             deps = ["//test/test_common:environment_lib"] + cc_binary,
             **kargs
         )
 
     else:
+        real_env = dict(env)
+        real_env.update({
+            "LD_LIBRARY_PATH": "/build/bazel_root/base/execroot/envoy/bazel-out/k8-fastbuild/bin/external/openssl/openssl/lib64",
+        })
         native.sh_test(
             name = name,
             srcs = ["//bazel:sh_test_wrapper.sh"],
             data = srcs + data + cc_binary,
             args = srcs,
             tags = tags + ["nocoverage"],
+            env = real_env,
             **kargs
         )

bazel/external/openssl.BUILD

@@ -6,36 +6,29 @@ licenses(["notice"])  # Apache 2
 filegroup(
     name = "all",
     srcs = glob(["**"]),
-    #visibility = ["//visibility:public"],
 )
 
 configure_make(
     name = "openssl",
     lib_source = ":all",
+    lib_name = "openssl",
     configure_in_place = True,
     configure_command = "Configure",
     targets = ["build_sw", "install_sw"],
     args = ["-j"],
     out_lib_dir = "lib64",
-    out_static_libs = ["libssl.a", "libcrypto.a"],
+    #out_static_libs = ["libssl.a", "libcrypto.a"],
     out_shared_libs = ["libssl.so.3", "libcrypto.so.3"],
     out_include_dir = "include",
     visibility = ["//visibility:public"],
 )
 
-# filegroup(
-#     name = "libs",
-#     srcs = [":openssl"],
-#     visibility = ["//visibility:public"],
-# )
-
 cc_library(
     name = "libs",
     deps = [":openssl"],
     visibility = ["//visibility:public"],
     srcs = [":openssl"],
-    data = [":openssl"],
-    alwayslink = True,
+    linkstatic = True,
 )
 
 # envoy_cc_library(

bssl-compat/BUILD

@@ -8,18 +8,40 @@ filegroup(
 licenses(["notice"])  # Apache 2
 
 cmake(
-    name = "bssl-compat",
+    name = "bssl-compat-cmake",
     lib_source = ":srcs",
     out_shared_libs = [],
     out_static_libs = ["libbssl-compat.a"],
-    visibility = ["//visibility:public"],
+    includes = ["include"],
     generate_crosstool_file = False,
 
     cache_entries = {"CMAKE_BUILD_TYPE": "Bazel"},
     generate_args = ["-GNinja"],
 
     build_args = [ "-j" ],
-    deps = ["@openssl//:libs"],
+    #deps = ["@openssl//:libs"],
+    build_data = ["@openssl//:libs"],
+    env = {
+        "OPENSSL_ROOT_DIR": "/build/bazel_root/base/execroot/envoy/bazel-out/k8-fastbuild/bin/external/openssl/openssl",
+        "LD_LIBRARY_PATH": "/build/bazel_root/base/execroot/envoy/bazel-out/k8-fastbuild/bin/external/openssl/openssl/lib64",
+    },
+)
+
+filegroup(
+    name = "bssl_includes",
+    srcs = glob([":bssl-compat-cmake/include/**/*.h"]),
+    visibility = ["//visibility:private"],
+)
+
+cc_library(
+    name = "bssl-compat",
+    #srcs = [":bssl-compat-cmake/lib/libbssl-compat.a"],
+    #srcs = [":bssl-compat-cmake"],
+    linkstatic = True,
+    includes = [":bssl-compat-cmake/include"],
+    hdrs = [":bssl_includes"],
+    deps = [":bssl-compat-cmake"],
+    data = ["@openssl//:libs"],
 )
 
 alias(

ci/do_ci.sh

@@ -206,7 +206,6 @@ function bazel_binary_build() {
   [[ -n "${ENVOY_RBE}" ]] && rm -rf bazel-bin/"${ENVOY_BIN}"*
 
   bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" "${BUILD_TARGET}" "${CONFIG_ARGS[@]}"
-  echo "envoy --version output: $(bazel-bin/"${ENVOY_BIN}" --version)"
   collect_build_profile "${BINARY_TYPE}"_build
 
   # Copy the built envoy binary somewhere that we can access outside of the