From 4cad3d69dfad4cd878e15adca58bcc71bc661682 Mon Sep 17 00:00:00 2001
From: Nils Hoppe <nils.hoppe@bmw.de>
Date: Fri, 20 Mar 2026 13:16:03 +0100
Subject: [PATCH 1/2] run_as_exec: Forward environment variables

Now env_inherit attributes passed ot py_test are now also respected in
run_as_exec macro
---
 quality/integration_testing/environments/run_as_exec.bzl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quality/integration_testing/environments/run_as_exec.bzl b/quality/integration_testing/environments/run_as_exec.bzl
index c829deb3d..c480686de 100644
--- a/quality/integration_testing/environments/run_as_exec.bzl
+++ b/quality/integration_testing/environments/run_as_exec.bzl
@@ -60,6 +60,7 @@ _RULE_ATTRS = {
         cfg = "exec",
     ),
     "env": attr.string_dict(),
+    "env_inherit": attr.string_list(),
     "executable": attr.label(
         allow_files = True,
         cfg = "exec",
@@ -88,7 +89,7 @@ def _executable_as_exec_impl(ctx):
                 ),
             ),
         ),
-        RunEnvironmentInfo(environment = ctx.attr.env),
+        RunEnvironmentInfo(environment = ctx.attr.env, inherited_environment = ctx.attr.env_inherit),
     ]
 
 _as_exec_run = rule(

From fce5319e78aa20c395334605355dd32403b9a92c Mon Sep 17 00:00:00 2001
From: Nils Hoppe <nils.hoppe@bmw.de>
Date: Fri, 20 Mar 2026 13:17:37 +0100
Subject: [PATCH 2/2] Pass DOCKER_HOST environment variable

Adds a pass-through for the DOCKER_HOST environment variable for
docker-based (integration) tests.

This enables e.g. rootless Docker setups.
---
 quality/integration_testing/integration_testing.bzl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/quality/integration_testing/integration_testing.bzl b/quality/integration_testing/integration_testing.bzl
index 7ec24fda8..b6003cc06 100644
--- a/quality/integration_testing/integration_testing.bzl
+++ b/quality/integration_testing/integration_testing.bzl
@@ -138,6 +138,7 @@ def integration_test(name, srcs, filesystem, **kwargs):
             pytest_bootstrap,
         ] + srcs,
         main = pytest_bootstrap,
+        env_inherit = ["DOCKER_HOST"],
         deps = [
             requirement("bazel-runfiles"),
             requirement("pytest"),
@@ -169,6 +170,12 @@ def integration_test(name, srcs, filesystem, **kwargs):
         ["//quality/sanitizer/constraints:no_tsan"],
     )
 
+    _extend_list_in_kwargs_without_duplicates(
+        kwargs,
+        "env_inherit",
+        ["DOCKER_HOST"],
+    )
+
     test_as_exec(
         name = name,
         executable = select({