From 50397de0ae7393124420b07d68d3bcacbef49963 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 22 Apr 2021 11:15:54 -0700 Subject: [PATCH] forward env vars through tpx Summary: The migration to tpx broke Watchman's tests because test_bser relies on YARN_YARN_OFFLINE_MIRROR being set in the environment and tpx doesn't forward environment variables into the test. Explicitly forward them ourselves. Reviewed By: fanzeyi Differential Revision: D27897172 fbshipit-source-id: 16c8017a89979802bd9d443825ed4e22cb6ff6c9 --- build/fbcode_builder/getdeps/builder.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 378b49065..745b9c7f3 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -746,6 +746,10 @@ if __name__ == "__main__": "--print-long-results", ] + if tpx and env: + testpilot_args.append("--env") + testpilot_args.extend(f"{key}={val}" for key, val in env.items()) + if owner: testpilot_args += ["--contacts", owner]