From bc01efff054583c07f9a066aefe7d84e0a00662a Mon Sep 17 00:00:00 2001
From: Anton Kirilov <antonvkirilov@proton.me>
Date: Wed, 19 Nov 2025 00:14:03 +0000
Subject: [PATCH 1/2] toolset: Fix the --force-rm option

Also, clean up the wrk Dockerfile.

Signed-off-by: Anton Kirilov <antonvkirilov@proton.me>
---
 .github/workflows/build.yml       |  2 +-
 toolset/continuous/tfb-startup.sh |  1 +
 toolset/run-tests.py              |  2 +-
 toolset/wrk/wrk.dockerfile        | 14 ++------------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46e7a2410e9..309873abc8c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -155,7 +155,7 @@ jobs:
           # run-ci.py runs the diffing to see if github actions needs to test this framework. Ideally/eventually,
           # we'd like to try and do the diffing before github_actions_clean & setup.
           # This will run the tests exactly as you would in your own vm:
-          docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --test-dir $RUN_TESTS --results-environment Github-Actions;
+          docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --force-rm --test-dir $RUN_TESTS --results-environment Github-Actions;
   dependabot:
     needs: verify
     runs-on: ubuntu-latest
diff --git a/toolset/continuous/tfb-startup.sh b/toolset/continuous/tfb-startup.sh
index 438f3deba51..b72f93e8f3b 100755
--- a/toolset/continuous/tfb-startup.sh
+++ b/toolset/continuous/tfb-startup.sh
@@ -47,6 +47,7 @@ docker run \
   --results-environment "$TFB_ENVIRONMENT" \
   --results-upload-uri "$TFB_UPLOAD_URI" \
   $(if [ "$TFB_RUN_ORDER" = "reverse" ]; then echo "--reverse-order"; fi) \
+  --force-rm \
   --quiet
 
 echo "zipping the results"
diff --git a/toolset/run-tests.py b/toolset/run-tests.py
index ac24969c4e4..9e65cec801d 100644
--- a/toolset/run-tests.py
+++ b/toolset/run-tests.py
@@ -210,7 +210,7 @@ def main(argv=None):
         help='Extra docker arguments to be passed to the test container')
     parser.add_argument(
         '--force-rm',
-        default=False,
+        action='store_true',
         help='Remove intermediate docker containers after running.')
 
     # Network options
diff --git a/toolset/wrk/wrk.dockerfile b/toolset/wrk/wrk.dockerfile
index 772fe3268fa..9d65d1108b8 100644
--- a/toolset/wrk/wrk.dockerfile
+++ b/toolset/wrk/wrk.dockerfile
@@ -1,17 +1,7 @@
 FROM ubuntu:24.04
 
-# Required scripts for benchmarking
-COPY concurrency.sh pipeline.lua pipeline.sh query.sh ./
-
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get install --no-install-recommends -qqUy curl wrk > /dev/null
 
-# Environment vars required by the wrk scripts with nonsense defaults
-ENV accept=accept \
-    duration=duration \
-    levels=levels \
-    max_concurrency=max_concurrency \
-    max_threads=max_threads \
-    name=name \
-    pipeline=pipeline \
-    server_host=server_host
+# Required scripts for benchmarking
+COPY concurrency.sh pipeline.lua pipeline.sh query.sh ./

From 9551d0ae703f1768c50c84a3c67cfcff1e7a0884 Mon Sep 17 00:00:00 2001
From: Anton Kirilov <antonvkirilov@proton.me>
Date: Sat, 22 Nov 2025 00:56:06 +0000
Subject: [PATCH 2/2] Address code review comments

---
 toolset/continuous/tfb-startup.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolset/continuous/tfb-startup.sh b/toolset/continuous/tfb-startup.sh
index b72f93e8f3b..438f3deba51 100755
--- a/toolset/continuous/tfb-startup.sh
+++ b/toolset/continuous/tfb-startup.sh
@@ -47,7 +47,6 @@ docker run \
   --results-environment "$TFB_ENVIRONMENT" \
   --results-upload-uri "$TFB_UPLOAD_URI" \
   $(if [ "$TFB_RUN_ORDER" = "reverse" ]; then echo "--reverse-order"; fi) \
-  --force-rm \
   --quiet
 
 echo "zipping the results"