From 7cf275edce6073a90dac3be222877eee9a385190 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Hugly <jice@scion.org>
Date: Fri, 24 Nov 2023 11:25:19 +0100
Subject: [PATCH] router: do not build a private router image for the
 newbenchmark test.

There's no reason to do that, we can just use the same image that's used for
everything else.
---
 acceptance/router_newbenchmark/BUILD.bazel | 9 +++------
 acceptance/router_newbenchmark/test.py     | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/acceptance/router_newbenchmark/BUILD.bazel b/acceptance/router_newbenchmark/BUILD.bazel
index e12d0b233f..ef661347b4 100644
--- a/acceptance/router_newbenchmark/BUILD.bazel
+++ b/acceptance/router_newbenchmark/BUILD.bazel
@@ -41,11 +41,12 @@ exports_files([
 args = [
     "--executable",
     "brload:$(location //acceptance/router_newbenchmark:brload)",
+    "--container-loader=posix-router:latest#$(location //docker:posix_router)"
 ]
 
 data = [
     ":conf",
-    ":router",
+    "//docker:posix_router",
     ":brload",
 ]
 
@@ -54,12 +55,8 @@ raw_test(
     src = "test.py",
     args = args,
     data = data,
-    homedir = "$(rootpath :router)",
+    homedir = "$(rootpath //docker:posix_router)",
     # This test uses sudo and accesses /var/run/netns.
     local = True,
 )
 
-container_image(
-    name = "router",
-    base = "//docker:posix_router",
-)
diff --git a/acceptance/router_newbenchmark/test.py b/acceptance/router_newbenchmark/test.py
index 47d4ccb7d1..866dced7d4 100644
--- a/acceptance/router_newbenchmark/test.py
+++ b/acceptance/router_newbenchmark/test.py
@@ -179,7 +179,7 @@ def setup_prepare(self):
                     "-e SCION_EXPERIMENTAL_BFD_DISABLE=true -e GOMAXPROCS=4 "
                     "--network container:prometheus "
                     "--name router "
-                    "bazel/acceptance/router_newbenchmark:router")
+                    "posix-router:latest")
 
         time.sleep(2)