Skip to content

Commit b90da9c

Browse files
committed
Merge bitcoin/bitcoin#33138: ci: Pass CI_FAILFAST_TEST_LEAVE_DANGLING into container
fa1d2f6 ci: Pass CI_FAILFAST_TEST_LEAVE_DANGLING into container (MarcoFalke) Pull request description: After commit fd813bf, the env var `CI_FAILFAST_TEST_LEAVE_DANGLING` is no longer passed into the container. This is harmless, because it isn't needed for the Linux containers and macos doesn't use containers at all. However, it would be nice to document it as an allowed setting and consistently pass it on, when set. So do that here. ACKs for top commit: fanquake: ACK fa1d2f6 Tree-SHA512: b61780a27f4c2e11359827b1360a34a132e15bff94f358cbf4d453805afcafb873e2c395908b17610fae026ead93226c19a8f6be40fbb87b623ee992f3e2b43e
2 parents fd813bf + fa1d2f6 commit b90da9c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

ci/test/02_run_container.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ def main():
2626
encoding="utf8",
2727
).stdout.splitlines()
2828
settings = set(l.split("=")[0].split("export ")[1] for l in settings)
29-
# Add this one manually, because it is the only one set inside the
30-
# container that also allows external overwrites
31-
settings.add("BASE_BUILD_DIR")
29+
# Add "hidden" settings, which are never exported, manually. Otherwise,
30+
# they will not be passed on.
31+
settings.update([
32+
"BASE_BUILD_DIR",
33+
"CI_FAILFAST_TEST_LEAVE_DANGLING",
34+
])
3235

3336
# Append $USER to /tmp/env to support multi-user systems and $CONTAINER_NAME
3437
# to allow support starting multiple runs simultaneously by the same user.

0 commit comments

Comments
 (0)