From d1c659924a24b6a6c21012d19bf1195cc8241961 Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Thu, 29 Sep 2022 10:39:45 +0200 Subject: [PATCH 1/2] prepare: fix venv sourcing when /bin/sh is Dash (e.g. on Debian) --- prepare.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prepare.py b/prepare.py index e7021ea..bcb3353 100755 --- a/prepare.py +++ b/prepare.py @@ -23,7 +23,7 @@ os.chdir(me) print("--- install python dependencies ---") venv.create(".venv", with_pip=True) shared.exec(""" -source .venv/bin/activate +. .venv/bin/activate which python3 python3 -m pip install . python3 -m pip install -r scenarios/requirements.txt @@ -36,6 +36,6 @@ flavor.download() print(f"""done! now, run: > sudo -i > cd {os.getcwd()} -> source ./.venv/bin/activate +> . ./.venv/bin/activate > ./mknet scenario ./topo/with-vdsl.yml ./scenarios/garage-s3lat garage-v0.8 """) From 37040718ea895dacb497e08760cb77cb63b40ecc Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Thu, 29 Sep 2022 10:40:34 +0200 Subject: [PATCH 2/2] Document s3billion --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 95f19d7..d5849f4 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ All scenarios: - `./scenarios/garage-s3lat [garage-v0.7|garage-v0.8]` - Run s3lat on Garage - `./scenarios/garage-concurrent [garage-v0.7|garage-v0.8]` - Run s3concurrent on Garage - `./scenarios/garage-warp [garage-v0.7|garage-v0.8] [default|fast]` - Run warp on Garage. 2 flavors are available: fast and default. + - `./scenarios/garage-s3billion [garage-v0.7|garage-v0.8]` - Run s3billion on Garage *Scenarios take optional flavors as input that modulate their behavioir. Passing them is not mandatory, a default one will be selected for you.*